summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow merge when no pipeline success38389-allow-merge-without-successEric Eastwood2017-10-057-39/+38
| | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38389
* Merge branch '37229-mr-widget-status-icon' into 'master'Jacob Schatz2017-10-053-19/+89
|\ | | | | | | | | | | | | improve merge request widget status icon UX Closes #37229 See merge request gitlab-org/gitlab-ce!14200
| * add changelog37229-mr-widget-status-iconSimon Knox2017-10-031-0/+5
| |
| * Merge remote-tracking branch 'origin' into 37229-mr-widget-status-iconSimon Knox2017-10-031089-7893/+12439
| |\
| * | improve merge request widget status icon UXSimon Knox2017-09-202-19/+84
| | | | | | | | | | | | x to indicate failure or cannot merge
* | | Merge branch 'winh-cleanup-select2-dropdowns' into 'master'Annabel Dunstone Gray2017-10-041-99/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cleanup Select2 dropdown styles Closes #37279 See merge request gitlab-org/gitlab-ce!14557
| * | | Cleanup Select2 dropdown stylesWinnie Hellmann2017-10-041-99/+46
|/ / /
* | | Merge branch 'mentions-in-comments' into 'master'Annabel Dunstone Gray2017-10-044-6/+18
|\ \ \ | | | | | | | | | | | | | | | | Makes `@mentions links` have a different styling for better separation See merge request gitlab-org/gitlab-ce!14377
| * | | Makes `@mentions links` have a different styling for better separationDimitrie Hoekstra2017-10-044-6/+18
|/ / /
* | | Merge branch 'update-unf_ext-0.0.7.4' into 'master'Rémy Coutable2017-10-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update unf_ext from 0.0.7.2 to 0.0.7.4 (#38368) Closes #38368 See merge request gitlab-org/gitlab-ce!14601
| * | | Update unf_ext from 0.0.7.2 to 0.0.7.4 (#38368)Lemures Lemniscati2017-09-301-1/+1
| | |/ | |/|
* | | Merge branch 'docs/openid-connect' into 'master'Rémy Coutable2017-10-042-0/+6
|\ \ \ | | | | | | | | | | | | | | | | Add link to OpenID Connect documentation See merge request gitlab-org/gitlab-ce!14368
| * | | Add link to OpenID Connect documentationMarkus Koller2017-09-192-0/+6
| | | |
* | | | Merge branch 'tag-link-size' into 'master'Rémy Coutable2017-10-043-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjusts tag link to avoid underlining spaces Closes #38122 See merge request gitlab-org/gitlab-ce!14544
| * | | | Adjusts tag link to avoid underlining spacesGuilherme Vieira2017-10-033-4/+9
| | | | |
* | | | | Merge branch 'master' into 'master'Rémy Coutable2017-10-042-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Sidekiq::MemoryKiller: Add missing space in log message See merge request gitlab-org/gitlab-ce!14553
| * | | | | Sidekiq::MemoryKiller: Add missing space in log messageBenjamin Drung2017-10-042-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sidekiq memory killer prints warnings like gitlab-sidekiq[8245]: 2017-09-27T11:31:43.192Z 8245 TID-ov9l6b4e0 WARN: this thread will shut down PID 8245 - Worker ProjectWebHookWorker - JID-dd3b1c23a653deec5e575ab4in 900 seconds There is a space missing between the JID and 'in'.
* | | | | | Merge branch 'merge-request-doco' into 'master'Rémy Coutable2017-10-041-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explain target_project_id vs project_id Closes #38539 See merge request gitlab-org/gitlab-ce!14594
| * | | | | | explain target_project_id vs project_idDavid Turner2017-10-031-0/+9
| | | | | | |
* | | | | | | Merge branch 'fix-edit-project-service-cancel-button-position' into 'master'Rémy Coutable2017-10-042-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix edit project service cancel button position See merge request gitlab-org/gitlab-ce!14596
| * | | | | | | Fix edit project service cancel button positionMatt Coleman2017-09-292-1/+6
| | | | | | | |
* | | | | | | | Merge branch 'fork-layout-cleanup' into 'master'Filipa Lacerda2017-10-045-108/+78
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup the fork layout See merge request gitlab-org/gitlab-ce!14617
| * | | | | | | | fixed specsfork-layout-cleanupPhil Hughes2017-10-022-1/+2
| | | | | | | | |
| * | | | | | | | Cleanup the fork layoutPhil Hughes2017-10-024-107/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cleans the fork project layout by removing the grid & reverting back to full flexbox to allow for the layout to correctly expand. - Removes duplicated markup - Fixes a bug where the forked project would trigger the load indicator
* | | | | | | | | Merge branch '26890-fix-default-branches-sorting' into 'master'Robert Speicher2017-10-045-147/+142
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the default branches sorting to actually be 'Last updated' Closes #26890 See merge request gitlab-org/gitlab-ce!14295
| * | | | | | | | | Fix the default branches sorting to actually be 'Last updated'26890-fix-default-branches-sortingRémy Coutable2017-09-255-147/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'docs/images-update' into 'master'Job van der Voort2017-10-0470-128/+99
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update images Closes #38487 See merge request gitlab-org/gitlab-ce!14655
| * | | | | | | | | | Update a bunch of docs imagesAchilleas Pipinellis2017-10-0470-128/+99
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'capture-rev-list-errors' into 'master'Sean McGivern2017-10-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include RevList error messages in exceptions See merge request gitlab-org/gitlab-ce!14658
| * | | | | | | | | | | Include RevList error messages in exceptionscapture-rev-list-errorsJacob Vosmaer2017-10-031-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'gitaly-fetch-ref' into 'master'Sean McGivern2017-10-047-22/+80
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let fetch_ref pull from Gitaly instead of from disk Closes gitaly#585 See merge request gitlab-org/gitlab-ce!14588
| * | | | | | | | | | | | Let fetch_ref pull from Gitaly instead of from diskJacob Vosmaer2017-10-047-22/+80
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'missing-exception-variable' into 'master'Sean McGivern2017-10-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing exception variable See merge request gitlab-org/gitlab-ce!14677
| * | | | | | | | | | | | | Add missing exception variableJacob Vosmaer2017-10-041-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'merge-request-notes-performance' into 'master'Sean McGivern2017-10-044-10/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a UNION ALL for getting merge request notes Closes #38508 See merge request gitlab-org/gitlab-ce!14620
| * | | | | | | | | | | | Use a UNION ALL for getting merge request notesmerge-request-notes-performanceYorick Peterse2017-10-024-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this particular case the use of UNION ALL leads to a better query plan compared to using 1 big query that uses an OR statement to combine different data sources. See https://gitlab.com/gitlab-org/gitlab-ce/issues/38508 for more information.
* | | | | | | | | | | | | Merge branch 'js-load-specific-locales' into 'master'Phil Hughes2017-10-046-26/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load only the currently needed JS locale file Closes #38470 See merge request gitlab-org/gitlab-ce!14533
| * | | | | | | | | | | | | Load only the currently needed JS locale fileTim Zallmann2017-10-046-26/+19
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'fix_migration_with_fast_forward_option' into 'master'Sean McGivern2017-10-043-3/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix AddFastForwardOptionToProject migration See merge request gitlab-org/gitlab-ce!14676
| * | | | | | | | | | | | Add a new migration to make sure that fast forward column exists in projects ↵fix_migration_with_fast_forward_optionValery Sizov2017-10-043-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table
| * | | | | | | | | | | | Fix AddFastForwardOptionToProject migrationValery Sizov2017-10-041-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge remote-tracking branch 'dev/master'Jarka Kadlecova2017-10-041-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJarka Kadlecova2017-10-041-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJarka Kadlecova2017-10-041-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Update CHANGELOG.md for 9.5.7Jose Ivan Vargas2017-10-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | Merge branch '36742-hide-close-mr-button-on-merge' into 'master'Fatih Acet2017-10-046-1/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide close MR button after merge without reloading page Closes #36742 See merge request gitlab-org/gitlab-ce!14122
| * | | | | | | | | | | | | | Hide close MR button after merge without reloading pageJacopo2017-09-246-1/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merging a MR the close button is hidden, without reloading the page.
* | | | | | | | | | | | | | | Merge branch 'dm-pat-revoke' into 'master'Sean McGivern2017-10-044-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set default scope on PATs that don't have one set to allow them to be revoked Closes #38650 See merge request gitlab-org/gitlab-ce!14660
| * | | | | | | | | | | | | | Set default scope on PATs that don't have one set to allow them to be revokeddm-pat-revokeDouwe Maan2017-10-034-3/+14
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'icons-profile-icons' into 'master'Phil Hughes2017-10-041-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Profile Events Helper to use SVG Sprite Icons See merge request gitlab-org/gitlab-ce!14577