summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix MR changes tab size countfix-mr-size-with-over-100-filesSean McGivern2017-02-233-1/+53
| | | | | | | | This was wrong when there were over 100 files in the diff, because we did not use the same diff options as subclasses of `Gitlab::Diff::FileCollection::Base` when getting the raw diffs. (The reason we don't use those classes directly is because they may perform highlighting, which isn't needed for just counting the diffs.)
* Merge branch '26875-builds-api-endpoint-skipped-scope' into 'master' Rémy Coutable2017-02-233-1/+19
|\ | | | | | | | | | | | | Add all available statuses to scope filter for project builds endpoint Closes #26875 See merge request !8971
| * Rebase to master for avoiding failing testsGeorge Andrinopoulos2017-02-233-1/+19
|/
* Merge branch '28495-content-shifting' into 'master' Filipa Lacerda2017-02-231-10/+6
|\ | | | | | | | | | | | | Keep right padding the same whether sidebar is open or not Closes #28495 See merge request !9422
| * Keep right padding the same whether sidebar is open or not28495-content-shiftingAnnabel Dunstone Gray2017-02-211-10/+6
| |
* | Merge branch '26348-cleanup-navigation-order-groups' into 'master' Alfredo Sumaran2017-02-2311-22/+52
|\ \ | | | | | | | | | | | | Cleaning up our navigational order - Groups See merge request !9309
| * | Code style improvementsAlfredo Sumaran2017-02-2311-22/+52
|/ /
* | Merge branch 'remove-require-context-filtered-search-bundle' into 'master' Alfredo Sumaran2017-02-231-3/+9
|\ \ | | | | | | | | | | | | Remove require.context from filtered_search_bundle See merge request !9460
| * | remove require.context from filtered_search_bundleremove-require-context-filtered-search-bundleMike Greiling2017-02-221-3/+9
| | |
* | | Merge branch 'remove-require-context-graphs-bundle' into 'master' Alfredo Sumaran2017-02-231-3/+4
|\ \ \ | | | | | | | | | | | | | | | | Remove require.context from graphs_bundle See merge request !9459
| * | | remove require.context from graphs_bundleremove-require-context-graphs-bundleMike Greiling2017-02-221-3/+4
| |/ /
* | | Merge branch 'remove-require-context-network-bundle' into 'master' Alfredo Sumaran2017-02-231-3/+2
|\ \ \ | | | | | | | | | | | | | | | | Remove require.context from network_bundle See merge request !9458
| * | | remove require.context from network_bundleremove-require-context-network-bundleMike Greiling2017-02-221-3/+2
| |/ /
* | | Merge branch 'update-ci-skip-regex-to-accept-underscores-and-hyphens' into ↵Robert Speicher2017-02-222-43/+31
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 'master' updated ci skip regex to accept underscores and hyphens See merge request !9130
| * | updated ci skip regex to accept underscores and hyphensupdate-ci-skip-regex-to-accept-underscores-and-hyphensLuke "Jared" Bennett2017-02-222-43/+31
| | |
* | | Merge branch 'improve-ee_compat_check-by-using-git-apply-3way-flag' into ↵Robert Speicher2017-02-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag See merge request !9447
| * | | Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag improve-ee_compat_check-by-using-git-apply-3way-flagRémy Coutable2017-02-221-1/+1
| | | | | | | | | | | | This should solve 99% of the false-positive of the `ee_compat_check` job.
* | | | Merge branch 'ignore-rails-cves' into 'master' Robert Speicher2017-02-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Ignore two Rails CVEs in bundler:audit job See merge request !9456
| * | | | Ignore two Rails CVEs in bundler:audit jobDouwe Maan2017-02-221-1/+1
|/ / / /
* | | | Merge branch '22466-task-list-alignment' into 'master' Annabel Dunstone Gray2017-02-224-11/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align Task List Checkboxes Closes #22466 See merge request !6487
| * | | | Position task list checkbox to match the list indentJared Deckard2017-02-104-11/+35
| | | | |
* | | | | Merge branch 'add-issues-tooltip' into 'master' Alfredo Sumaran2017-02-224-5/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tooltip to add issues button on issue boards Closes #27985 See merge request !9142
| * | | | | Added testsadd-issues-tooltipPhil Hughes2017-02-212-2/+8
| | | | | |
| * | | | | Added CHANGELOGPhil Hughes2017-02-211-0/+4
| | | | | |
| * | | | | Added tooltip to add issues button on issue boardsPhil Hughes2017-02-211-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | Closes #27985
* | | | | | Merge branch 'newline-after-file-attachment-notes' into 'master' Alfredo Sumaran2017-02-222-2/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added double newline after file upload markdown insert Closes #28511 See merge request !9430
| * | | | | | Added double newline after file upload markdown insertLuke "Jared" Bennett2017-02-222-2/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'docs/pages-redirect' into 'master' Achilleas Pipinellis2017-02-221-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Pages readme See merge request !9454
| * | | | | | Remove Pages readmeAchilleas Pipinellis2017-02-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent a redirect loop in docs.gitlab.com/ce/pages/ [ci skip]
* | | | | | | Merge branch 'docs/pages-redirect' into 'master' Achilleas Pipinellis2017-02-221-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change Pages redirect See merge request !9452
| * | | | | | Change Pages redirectAchilleas Pipinellis2017-02-221-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch ↵Clement Ho2017-02-226-9/+105
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'gamesover/gitlab-ce-broken_iamge_when_doing_offline_update_check(help_page)' into 'master' Gamesover/gitlab ce broken iamge when doing offline update check(help page) See merge request !8539
| * | | | | | added specs for version check imagegamesover/gitlab-ce-broken_iamge_when_doing_offline_update_check(help_page)Luke "Jared" Bennett2017-02-226-9/+105
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'pages-guides' into 'master' Achilleas Pipinellis2017-02-225-40/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing link from Pages guides See merge request !9450
| * | | | | | Add missing index.md to Pages docsAchilleas Pipinellis2017-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Reorder main index items in Pages overviewAchilleas Pipinellis2017-02-224-39/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'remove-require-context-boards-bundle' into 'master' Alfredo Sumaran2017-02-221-8/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from boards_bundle See merge request !9392
| * | | | | | | remove unneeded eslint exceptionsremove-require-context-boards-bundleMike Greiling2017-02-201-1/+1
| | | | | | | |
| * | | | | | | remove require.context from boards_bundleMike Greiling2017-02-201-7/+11
| | | | | | | |
* | | | | | | | Merge branch 'revert-2cf17c42' into 'master' Alfredo Sumaran2017-02-227-84/+105
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '27934-left-align-nav' into 'master'" See merge request !9423
| * | | | | | | | Revert "Merge branch '27934-left-align-nav' into 'master'"revert-2cf17c42Annabel Dunstone Gray2017-02-217-84/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !9338
* | | | | | | | | Merge branch 'remove-require-context-diff-notes-bundle' into 'master' Alfredo Sumaran2017-02-221-7/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from diff_notes_bundle See merge request !9394
| * | | | | | | | | remove require.context from diff_notes_bundleremove-require-context-diff-notes-bundleMike Greiling2017-02-201-7/+11
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pages-guides' into 'master' Achilleas Pipinellis2017-02-2212-0/+858
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab Pages: new guides Closes #28097, gitlab-ee#994, #28098, and #28190 See merge request !9395
| * | | | | | | | remove html commentspages-guidesMarcia Ramos2017-02-221-4/+0
| | | | | | | | |
| * | | | | | | | remove <>Marcia Ramos2017-02-221-2/+2
| | | | | | | | |
| * | | | | | | | wrapping text - part 3Marcia Ramos2017-02-221-31/+139
| | | | | | | | |
| * | | | | | | | wrapping text - part 2 [ci skip]Marcia Ramos2017-02-221-17/+62
| | | | | | | | |
| * | | | | | | | fix linkMarcia Ramos2017-02-221-1/+1
| | | | | | | | |
| * | | | | | | | wrap text - part 1 - [ci skip]Marcia Ramos2017-02-221-40/+143
| | | | | | | | |