Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/models
AgeCommit message (Collapse)Author
2017-05-25Merge branch 'dm-fix-routes' into 'master'Robert Speicher
Fix ambiguous routing issues by teaching router about reserved words See merge request !11570
2017-05-24Merge branch 'zj-fix-pipeline-etag' into 'master'Kamil Trzciński
Fix pipeline etag Closes #32658 See merge request !11615
2017-05-19Merge branch '9-2-stable-fix-conflicts-for-mr-11298' into '9-2-stable'Douwe Maan
Fix 9.2 conflicts for "Fix conflict resolution from corrupted upstream" See merge request !11533
2017-05-19Merge branch 'disable-usage-ping' into 'master'Robert Speicher
Usage ping updates Closes #31741 and #31453 See merge request !11231
2017-05-19Fix 9.2 conflicts for 'Fix conflict resolution from corrupted upstream'Douwe Maan
2017-05-19Merge branch 'update_assignee_cache_counts_refactoring' into 'master' Sean McGivern
Rework update_assignee_cache_counts Closes #31873 See merge request !11270
2017-05-19Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'Douwe Maan
Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298 Conflicts: app/models/merge_request.rb spec/models/merge_request_spec.rb
2017-05-19Merge branch '31978-cross-reference-fix' into 'master' Sean McGivern
Fix cross referencing for private and internal projects Closes #31978 See merge request !11243
2017-05-19Merge branch 'dm-no-conflicts-when-branches-are-missing-9-2' into '9-2-stable'Regis Boudinot
Stop MR conflict code from blowing up when branches are missing (9.2) See merge request !11502
2017-05-18Stop MR conflict code from blowing up when branches are missingDouwe Maan
2017-05-18Merge branch 'mk-fix-issue-1843' into 'master'Douwe Maan
Fix root groups redirecting to group owner Closes #32474 See merge request !11465
2017-05-18Gitaly reuse stubsAndrew Newdigate
2017-05-18Merge branch 'mrchrisw-fix-slack-notify' into 'master' Sean McGivern
Fix notify_only_default_branch check for Slack service See merge request !11154
2017-05-17Snippet include EditableLuke "Jared" Bennett
2017-05-17Added editable concernLuke "Jared" Bennett
2017-05-11Merge branch 'retried-in-database-mysql' into 'master' Regis Boudinot
Retried in database Closes #25737 See merge request !11115
2017-05-10Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan
Refactor snippets finder & dont return internal snippets for external users See merge request !2094
2017-05-10Merge branch 'mr-widget-redesign-review' into 'master'Jacob Schatz
Merge request widget redesign Closes #25424 and #27950 See merge request !10319
2017-05-09Merge branch 'sh-fix-almost-there-spec-mysql' into 'master' Sean McGivern
Fix sub-second timing comparison error for Devise confirmation period Closes gitlab-ee#2362 See merge request !11156
2017-05-08Merge branch 'fix/gl-project-id' into 'master'James Lopez
Omit gl_project_id from Import/Export Closes #29813 See merge request !11032
2017-05-08Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' Robert Speicher
Add support for commit diff ignore_whitespace_change and paths flags Closes gitaly#198 See merge request !11028
2017-05-08Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg
2017-05-08Re-enable Gitaly commit_raw_diff featureAhmad Sherif
2017-05-06Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ↵Kamil Trzciński
'master' Check access to a branch when user triggers manual action Closes #20261 See merge request !10494
2017-05-06Real time pipeline show actionZeger-Jan van de Weg
2017-05-06Fix `Routable.find_by_full_path` on MySQLSean McGivern
2017-05-06Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern
Resolve "Redirect to new project link after a rename" Closes #17361 and #30317 See merge request !11136
2017-05-06Reduce risk of deadlocksMichael Kozono
We’ve seen a deadlock in CI here https://gitlab.com/mkozono/gitlab-ce/builds/15644492#down-build-trace. This commit should not fix that particular failure, but perhaps it will avoid others. * Don’t call delete_conflicting_redirects after update if the path wasn’t changed * Rename descendants without using recursion again, so we can run delete_conflicting_redirects exactly once.
2017-05-06Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable'Sean McGivern
2017-05-05Merge branch 'mia_backort' into 'master' Jacob Schatz
Backport of Multiple Assignees feature See merge request !11089
2017-05-05Resolve discussionsMichael Kozono
2017-05-05Resolve discussionsMichael Kozono
2017-05-05Resolve discussionsMichael Kozono
2017-05-05RefactorMichael Kozono
2017-05-05Delete conflicting redirectsMichael Kozono
2017-05-05Create redirect routes on path changeMichael Kozono
2017-05-05Redirect from redirect routes to canonical routesMichael Kozono
2017-05-05Merge branch 'balsalmiq-support' into 'master' Phil Hughes
Initial balsamiq support See merge request !10564
2017-05-05Merge branch 'add-sentry-js-again-with-vue' into 'master' Phil Hughes
Add sentry JS See merge request !6764
2017-05-05Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵Valery Sizov
skip]
2017-05-05[Multiple issue assignee] Fix a number of specsValery Sizov
2017-05-05Merge commit '3a2b60f7' from 'master'Grzegorz Bizon
* commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (151 commits) Fixed Karma spec Reject EE reserved namespace paths in CE as well Updated webpack config Include the bundler:audit job into the static-analysis job Document serializers Add artifact file page that uses the blob viewer Pipeline table mini graph dropdown remains open when table is refreshed Adds off for event hub Compile gitlab-shell go executables Allow to create new branch and empty WIP merge request from issue page Moved to a view spec Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.md Convert seconds to minutes and hours on chat notifations Disable navigation to Pages config if Pages is disabled Sort the network graph both by commit date and topographically. Add tooltips to note action buttons Add breadcrumb, build header and pipelines submenu to artifacts browser Update todos screenshots removes the possibility of commit messages having carriage returns Handle incoming emails from aliases correctly ...
2017-05-05Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila
Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb
2017-05-05Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett
# Conflicts: # db/schema.rb
2017-05-04Update last_repository_updated_at when the wiki is updatedDouglas Barbosa Alexandre
2017-05-04Update last_repository_updated_at when a push event is createdDouglas Barbosa Alexandre
2017-05-04Set last_repository_updated_at to created_at upon project creationDouglas Barbosa Alexandre
2017-05-04[Multiple issue assignees] Resolving conflictsValery Sizov
2017-05-04Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern
Use blob viewer for job artifacts Closes #31297 See merge request !11018
2017-05-04Backport of multiple_assignees_feature [ci skip]Valery Sizov
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 18:57:55 +0300