Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use grape to validate parameters in the members APIapi-remove-attributes_for_keys | Robert Schilling | 2017-02-23 | 2 | -8/+6 |
| | |||||
* | Merge branch 'api-notes-entity-fields' into 'master' | Sean McGivern | 2017-02-23 | 13 | -24/+723 |
|\ | | | | | | | | | | | | | Remove deprecated `upvotes` and `downvotes` from the notes API Closes #28441 See merge request !9384 | ||||
| * | Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fields | Robert Schilling | 2017-02-22 | 222 | -1125/+898 |
| |\ | | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md | ||||
| * | | Remove deprecated `upvotes` and `downvotes` from the notes API | Robert Schilling | 2017-02-22 | 13 | -25/+723 |
| | | | |||||
* | | | Merge branch '26875-builds-api-endpoint-skipped-scope' into 'master' | Rémy Coutable | 2017-02-23 | 3 | -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 tests | George Andrinopoulos | 2017-02-23 | 3 | -1/+19 |
|/ / / | |||||
* | | | Merge branch '28495-content-shifting' into 'master' | Filipa Lacerda | 2017-02-23 | 1 | -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-shifting | Annabel Dunstone Gray | 2017-02-21 | 1 | -10/+6 |
| | | | | |||||
* | | | | Merge branch '26348-cleanup-navigation-order-groups' into 'master' | Alfredo Sumaran | 2017-02-23 | 11 | -22/+52 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Cleaning up our navigational order - Groups See merge request !9309 | ||||
| * | | | | Code style improvements | Alfredo Sumaran | 2017-02-23 | 11 | -22/+52 |
|/ / / / | |||||
* | | | | Merge branch 'remove-require-context-filtered-search-bundle' into 'master' | Alfredo Sumaran | 2017-02-23 | 1 | -3/+9 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove require.context from filtered_search_bundle See merge request !9460 | ||||
| * | | | | remove require.context from filtered_search_bundleremove-require-context-filtered-search-bundle | Mike Greiling | 2017-02-22 | 1 | -3/+9 |
| | | | | | |||||
* | | | | | Merge branch 'remove-require-context-graphs-bundle' into 'master' | Alfredo Sumaran | 2017-02-23 | 1 | -3/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from graphs_bundle See merge request !9459 | ||||
| * | | | | | remove require.context from graphs_bundleremove-require-context-graphs-bundle | Mike Greiling | 2017-02-22 | 1 | -3/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'remove-require-context-network-bundle' into 'master' | Alfredo Sumaran | 2017-02-23 | 1 | -3/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from network_bundle See merge request !9458 | ||||
| * | | | | | remove require.context from network_bundleremove-require-context-network-bundle | Mike Greiling | 2017-02-22 | 1 | -3/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'update-ci-skip-regex-to-accept-underscores-and-hyphens' into ↵ | Robert Speicher | 2017-02-22 | 2 | -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-hyphens | Luke "Jared" Bennett | 2017-02-22 | 2 | -43/+31 |
| | | | | | |||||
* | | | | | Merge branch 'improve-ee_compat_check-by-using-git-apply-3way-flag' into ↵ | Robert Speicher | 2017-02-22 | 1 | -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-flag | Rémy Coutable | 2017-02-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | This should solve 99% of the false-positive of the `ee_compat_check` job. | ||||
* | | | | | | Merge branch 'ignore-rails-cves' into 'master' | Robert Speicher | 2017-02-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore two Rails CVEs in bundler:audit job See merge request !9456 | ||||
| * | | | | | | Ignore two Rails CVEs in bundler:audit job | Douwe Maan | 2017-02-22 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch '22466-task-list-alignment' into 'master' | Annabel Dunstone Gray | 2017-02-22 | 4 | -11/+35 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align Task List Checkboxes Closes #22466 See merge request !6487 | ||||
| * | | | | | | Position task list checkbox to match the list indent | Jared Deckard | 2017-02-10 | 4 | -11/+35 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'add-issues-tooltip' into 'master' | Alfredo Sumaran | 2017-02-22 | 4 | -5/+51 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tooltip to add issues button on issue boards Closes #27985 See merge request !9142 | ||||
| * | | | | | | | Added testsadd-issues-tooltip | Phil Hughes | 2017-02-21 | 2 | -2/+8 |
| | | | | | | | | |||||
| * | | | | | | | Added CHANGELOG | Phil Hughes | 2017-02-21 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Added tooltip to add issues button on issue boards | Phil Hughes | 2017-02-21 | 1 | -3/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #27985 | ||||
* | | | | | | | | Merge branch 'newline-after-file-attachment-notes' into 'master' | Alfredo Sumaran | 2017-02-22 | 2 | -2/+12 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added double newline after file upload markdown insert Closes #28511 See merge request !9430 | ||||
| * | | | | | | | | Added double newline after file upload markdown insert | Luke "Jared" Bennett | 2017-02-22 | 2 | -2/+12 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'docs/pages-redirect' into 'master' | Achilleas Pipinellis | 2017-02-22 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Pages readme See merge request !9454 | ||||
| * | | | | | | | | Remove Pages readme | Achilleas Pipinellis | 2017-02-22 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent a redirect loop in docs.gitlab.com/ce/pages/ [ci skip] | ||||
* | | | | | | | | | Merge branch 'docs/pages-redirect' into 'master' | Achilleas Pipinellis | 2017-02-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Pages redirect See merge request !9452 | ||||
| * | | | | | | | | Change Pages redirect | Achilleas Pipinellis | 2017-02-22 | 1 | -1/+1 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | Merge branch ↵ | Clement Ho | 2017-02-22 | 6 | -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" Bennett | 2017-02-22 | 6 | -9/+105 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'pages-guides' into 'master' | Achilleas Pipinellis | 2017-02-22 | 5 | -40/+47 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing link from Pages guides See merge request !9450 | ||||
| * | | | | | | | | Add missing index.md to Pages docs | Achilleas Pipinellis | 2017-02-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | | Reorder main index items in Pages overview | Achilleas Pipinellis | 2017-02-22 | 4 | -39/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | | Merge branch 'remove-require-context-boards-bundle' into 'master' | Alfredo Sumaran | 2017-02-22 | 1 | -8/+12 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from boards_bundle See merge request !9392 | ||||
| * | | | | | | | | | remove unneeded eslint exceptionsremove-require-context-boards-bundle | Mike Greiling | 2017-02-20 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | remove require.context from boards_bundle | Mike Greiling | 2017-02-20 | 1 | -7/+11 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'revert-2cf17c42' into 'master' | Alfredo Sumaran | 2017-02-22 | 7 | -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-2cf17c42 | Annabel Dunstone Gray | 2017-02-21 | 7 | -84/+105 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !9338 | ||||
* | | | | | | | | | | | Merge branch 'remove-require-context-diff-notes-bundle' into 'master' | Alfredo Sumaran | 2017-02-22 | 1 | -7/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove require.context from diff_notes_bundle See merge request !9394 | ||||
| * | | | | | | | | | | | remove require.context from diff_notes_bundleremove-require-context-diff-notes-bundle | Mike Greiling | 2017-02-20 | 1 | -7/+11 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'pages-guides' into 'master' | Achilleas Pipinellis | 2017-02-22 | 12 | -0/+858 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab Pages: new guides Closes #28097, gitlab-ee#994, #28098, and #28190 See merge request !9395 | ||||
| * | | | | | | | | | | remove html commentspages-guides | Marcia Ramos | 2017-02-22 | 1 | -4/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | remove <> | Marcia Ramos | 2017-02-22 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | wrapping text - part 3 | Marcia Ramos | 2017-02-22 | 1 | -31/+139 |
| | | | | | | | | | | |