summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | fixed specsPhil Hughes2018-01-163-3/+111
| | | | | | | | | | |
| * | | | | | | | | | removed console.logPhil Hughes2018-01-161-1/+0
| | | | | | | | | | |
| * | | | | | | | | | fixed shortcuts not working on some pagesPhil Hughes2018-01-163-7/+5
| | | | | | | | | | |
| * | | | | | | | | | Added dispatcher imports for some project routesPhil Hughes2018-01-1620-156/+52
| | | | | | | | | | |
* | | | | | | | | | | Update CHANGELOG.md for 10.1.7Oswaldo Ferreira2018-01-181-0/+4
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'remove-ide-pref' into 'master'Tim Zallmann2018-01-182-29/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove IDE option from user preferences See merge request gitlab-org/gitlab-ce!16454
| * | | | | | | | | | remove specsremove-ide-prefPhil Hughes2018-01-151-12/+0
| | | | | | | | | | |
| * | | | | | | | | | Remove IDE option from user preferencesPhil Hughes2018-01-151-17/+0
| | | | | | | | | | |
* | | | | | | | | | | Update CHANGELOG.md for 10.2.7Oswaldo Ferreira2018-01-181-0/+4
| |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'jramsay-15567-lfs-icon-docs' into 'master'Marcia Ramos2018-01-182-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Git LFS status icon to docs See merge request gitlab-org/gitlab-ce!16555
| * | | | | | | | | | Add Git LFS status icon to docsjramsay-15567-lfs-icon-docsJames Ramsay2018-01-182-0/+5
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'docs-articles-index-comments-false' into 'master'Achilleas Pipinellis2018-01-181-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: set comments to false on deprecated articles list doc See merge request gitlab-org/gitlab-ce!16498
| * | | | | | | | | | set comments to false, add link to the user docsdocs-articles-index-comments-falseMarcia Ramos2018-01-161-0/+5
| | | | | | | | | | |
* | | | | | | | | | | Update CHANGELOG.md for 10.3.5Oswaldo Ferreira2018-01-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge branch 'docs-ce-readme' into 'master'Achilleas Pipinellis2018-01-181-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: fix typo to open source See merge request gitlab-org/gitlab-ce!16549
| * | | | | | | | | | | Fix: fix typo to open sourceOnuwa Nnachi Isaac2018-01-181-4/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'gitaly-commit-signature' into 'master'Sean McGivern2018-01-188-41/+156
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retrieve commit signatures with Gitaly Closes gitaly#923 See merge request gitlab-org/gitlab-ce!16467
| * | | | | | | | | | Retrieve commit signatures with GitalyJacob Vosmaer (GitLab)2018-01-188-41/+156
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'remove-rugged-walk' into 'master'Douwe Maan2018-01-182-64/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Rugged::Walker from Repository#log Closes #42089 See merge request gitlab-org/gitlab-ce!16525
| * | | | | | | | | Remove Rugged::Walker from Repository#logJacob Vosmaer (GitLab)2018-01-182-64/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch ↵Douwe Maan2018-01-181-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42172-deprecation-warning-timestamps-was-called-without-specifying-an-option-for-null-in-rails-5-this-behavior-will-change-to-null-false' into 'master' Resolve "DEPRECATION WARNING: `#timestamps` was called without specifying an option for `null`. In Rails 5, this behavior will change to `null: false`..." Closes #42172 See merge request gitlab-org/gitlab-ce!16545
| * | | | | | | | | Get rid of a Rails 5 deprecation warning in ↵Rémy Coutable2018-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db/migrate/20170425112128_create_pipeline_schedules_table.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'rc/fix-update_upload_paths_to_system_spec' into 'master'Sean McGivern2018-01-181-26/+32
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spec/migrations/update_upload_paths_to_system_spec.rb to use the :migration metadata See merge request gitlab-org/gitlab-ce!16546
| * | | | | | | | | Fix spec/migrations/update_upload_paths_to_system_spec.rb to use the ↵rc/fix-update_upload_paths_to_system_specRémy Coutable2018-01-181-26/+32
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :migration metadata Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'Jacob Schatz2018-01-182-1/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Mermaid drawings not loading on some browsers Closes #42052 See merge request gitlab-org/gitlab-ce!16537
| * | | | | | | | | Fix Mermaid drawings not loading on some browserssh-fix-mermaid-start-on-load-typoStan Hu2018-01-172-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in https://github.com/knsv/mermaid/issues/291#issuecomment-287673609, the parameter should be `startOnLoad` instead of `loadOnStart`. In addition, `mermaid.initialize()` expects to see `startOnLoad` in the `mermaid` hash: https://github.com/knsv/mermaid/blob/6cd5ffe637d88525b93417bf3954e9c0e5a4deb8/src/mermaid.js#L118 Closes #42052
* | | | | | | | | | Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-1829-61/+419
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
| * | | | | | | | | | accept_confirm requires js driverAlexis Reigel2018-01-171-1/+1
| | | | | | | | | | |
| * | | | | | | | | | reference triggers.values for permitted parametersAlexis Reigel2018-01-174-17/+33
| | | | | | | | | | |
| * | | | | | | | | | add missing permitted paramAlexis Reigel2018-01-172-0/+2
| | | | | | | | | | |
| * | | | | | | | | | use class reader instead of dynamic constantAlexis Reigel2018-01-176-10/+12
| | | | | | | | | | |
| * | | | | | | | | | no need for a named parameterAlexis Reigel2018-01-173-3/+3
| | | | | | | | | | |
| * | | | | | | | | | accepts `.all` as a hook scope as wellAlexis Reigel2018-01-172-2/+11
| | | | | | | | | | |
| * | | | | | | | | | use safer .hooks_for instead of .public_sendAlexis Reigel2018-01-174-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with .public_send we can't make sure that the scope on the model actually exists.
| * | | | | | | | | | extract concern for hook triggersAlexis Reigel2018-01-174-23/+67
| | | | | | | | | | |
| * | | | | | | | | | doc for system hook merge_requests_eventsAlexis Reigel2018-01-171-0/+129
| | | | | | | | | | |
| * | | | | | | | | | doc for system hook merge_requests_events apiAlexis Reigel2018-01-041-0/+2
| | | | | | | | | | |
| * | | | | | | | | | api support for merge_requests_events system hookAlexis Reigel2018-01-044-3/+23
| | | | | | | | | | |
| * | | | | | | | | | add changelogAlexis Reigel2018-01-041-0/+5
| | | | | | | | | | |
| * | | | | | | | | | we only need a test for the happy pathAlexis Reigel2018-01-041-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the failure case is already covered by the test in spec/services/test_hooks/system_service_spec.rb
| * | | | | | | | | | use sentence case for "Merge request events"Alexis Reigel2018-01-044-4/+4
| | | | | | | | | | |
| * | | | | | | | | | merge requests on system hook admin pageAlexis Reigel2018-01-042-8/+70
| | | | | | | | | | |
| * | | | | | | | | | test hook for system merge request hookAlexis Reigel2018-01-042-0/+27
| | | | | | | | | | |
| * | | | | | | | | | invoke SystemHooksService instead of direct modelAlexis Reigel2018-01-042-10/+4
| | | | | | | | | | |
| * | | | | | | | | | execute system hooks from projectAlexis Reigel2018-01-044-2/+32
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '42129-fix-project-snippet-user-agent-detail' into 'master'Sean McGivern2018-01-183-8/+16
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the user-agent detail API endpoint for project snippets Closes #42129 See merge request gitlab-org/gitlab-ce!16521
| * | | | | | | | | | Fix the user-agent detail API endpoint for project snippetsNick Thomas2018-01-173-8/+16
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'winh-stop-jobs-modal' into 'master'Phil Hughes2018-01-188-10/+160
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add modal for stopping jobs in admin area Closes #41305 See merge request gitlab-org/gitlab-ce!16283
| * | | | | | | | | | | Add modal for stopping jobs in admin areaWinnie Hellmann2018-01-188-10/+160
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jramsay-improved-convdev-image-docs' into 'master'Sean McGivern2018-01-181-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ConvDev Index docs w better screenshot See merge request gitlab-org/gitlab-ce!16533
View Lorry Controller Status