summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'rs-empty_project-requests' into 'master'Rémy Coutable2017-01-2717-44/+44
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `:empty_project` where possible in request specs See merge request !8833
| * | | | | | | | | | | | Use `:empty_project` where possible in request specsrs-empty_project-requestsRobert Speicher2017-01-2617-44/+44
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs-ci-php-npm' into 'master'Rémy Coutable2017-01-272-0/+162
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added PHP & NPM samples for Gitlab CI See merge request !6199
| * | | | | | | | | | | | TyposIonut Staicu2017-01-271-12/+17
| | | | | | | | | | | | |
| * | | | | | | | | | | | Small gramatical tweaksIonut Staicu2017-01-272-5/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | TyposIonut Staicu2017-01-271-10/+11
| | | | | | | | | | | | |
| * | | | | | | | | | | | Added PHP & NPM docIonut Staicu2017-01-272-0/+156
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'depr-devise-test-fixed' into 'master'Rémy Coutable2017-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix depr. warning; use `Devise::Test::ControllerHelpers` Closes #26942 See merge request !8812
| * | | | | | | | | | | | fix depr. warning; use `Devise::Test::ControllerHelpers`Adam Pahlevi2017-01-261-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'issue_27211' into 'master'Rémy Coutable2017-01-272-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused js response from refs controller Closes #27211 See merge request !8828
| * | | | | | | | | | | | Remove unused js response from refs controllerissue_27211Felipe Artur2017-01-262-6/+4
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '26844-new-search-bar-performs-a-new-request-for-each-tag' into ↵Alfredo Sumaran2017-01-277-39/+137
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add caching of droplab ajax requests Closes #26844 See merge request !8725
| * | | | | | | | | | | | Add caching of droplab ajax requests26844-new-search-bar-performs-a-new-request-for-each-tagClement Ho2017-01-267-39/+137
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'revert-filter-assigned-to-me' into 'master' Filipa Lacerda2017-01-263-20/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert filter-assigned-to-me Closes #27176 See merge request !8785
| * | | | | | | | | | | | Revert 3f17f29arevert-filter-assigned-to-meClement Ho2017-01-263-20/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '27277-small-mini-pipeline-graph-glitch-upon-hover' into 'master' Filipa Lacerda2017-01-262-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed small mini pipeline graph line glitch Closes #27277 See merge request !8804
| * | | | | | | | | | | | | Add MR id to changelog entryFilipa Lacerda2017-01-261-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fixed small mini pipeline graph line glitchdimitrieh2017-01-262-2/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '27044-fix-explore-sorting-on-trending' into 'master' Fatih Acet2017-01-264-0/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix /explore sorting (trending) Closes #27044 See merge request !8792
| * | | | | | | | | | | | | | Fix /explore sorting (trending)Eric Eastwood2017-01-264-0/+41
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27044
* | | | | | | | | | | | | | Merge branch '27220-jqxhr-responsejson-message-is-undefined-in-safari' into ↵Fatih Acet2017-01-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Prevent form to be submitted twice Closes #27220 See merge request !8825
| * | | | | | | | | | | | | | Prevent form to be submitted twiceAlfredo Sumaran2017-01-261-0/+1
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch ↵Fatih Acet2017-01-262-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27124-search-bar-does-not-load-discussion-notes-selected-labels' into 'master' Fix filtered search so that labels selected from discussion notes display correctly Closes #27124 See merge request !8756
| * | | | | | | | | | | | | | Fix filtered search so that labels selected from discussion notes display ↵27124-search-bar-does-not-load-discussion-notes-selected-labelsClement Ho2017-01-252-1/+20
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly
* | | | | | | | | | | | | | Merge branch ↵Fatih Acet2017-01-262-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27254-clicking-line-anchor-multiple-times-causes-scroll-position-to-over-correct' into 'master' Resolve "Clicking line anchor multiple times causes scroll position to over-correct" Closes #27254 See merge request !8791
| * | | | | | | | | | | | | | prevent LineHighlighter from updating scroll position27254-clicking-line-anchor-multiple-times-causes-scroll-position-to-over-correctMike Greiling2017-01-251-2/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | use handleLocationHash utility methodMike Greiling2017-01-251-2/+4
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'storages-doc-update' into 'master' Douwe Maan2017-01-263-102/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change repository storage paths location for clarity See merge request !8757
| * | | | | | | | | | | | | | Change repository storage paths location for claritystorages-doc-updateAlejandro Rodríguez2017-01-253-102/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove duplicate link in the index to that documentation
* | | | | | | | | | | | | | | Merge branch 'fix-trace-reader-encoding' into 'master' Douwe Maan2017-01-262-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure TraceReader uses Encoding.default_external Closes #27052 See merge request !8801
| * | | | | | | | | | | | | | | Make sure TraceReader uses Encoding.default_externalfix-trace-reader-encodingLin Jen-Shin2017-01-262-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encoding.default_external was chosen over Encoding.default_internal because File.read is returning Encoding.default_external, therefore we should align with it. Alternatively, we could force both of them to be Encoding.default_internal. However, ideally this should be determined by different projects. For example, some projects might want to use an encoding different to what GitLab is using. This might not happen soon though. Closes #27052
* | | | | | | | | | | | | | | | Merge branch 'polettix/gitlab-ce-master' into 'master' Achilleas Pipinellis2017-01-261-28/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify wording in "adding an image" docs See merge request !8819
| * | | | | | | | | | | | | | | | Simplify wording in "adding an image" docsFlavio Poletti2017-01-261-28/+22
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'update_repo_check_docs' into 'master' Achilleas Pipinellis2017-01-261-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update repository check documentation See merge request !8815
| * | | | | | | | | | | | | | | | | Update repository check documentation Drew Blessing2017-01-261-5/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation seemed to be out of date with actual defaults in configuration and code.
* | | | | | | | | | | | | | | | | Merge branch 'correct-issue-filter-dropdown-user-avatar-stretch' into 'master' Annabel Dunstone Gray2017-01-263-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed flexbox and wrap issues See merge request !8745
| * | | | | | | | | | | | | | | | Fixed flexbox and wrap issuesLuke "Jared" Bennett2017-01-263-5/+9
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'improve-two_factor_authentication-doc' into 'master' 27220-jqxhr-responsejson-message-is-undefined-in-safariRémy Coutable2017-01-261-56/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update two_factor_authentication.md See merge request !8814
| * | | | | | | | | | | | | | | | Update two_factor_authentication.mdWilliam Abernathy2017-01-261-56/+54
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I wanted to practice GFM markdown, so I picked this page more or less at random. I flattened out the text a little. It's not as interesting, but will be easier to translate. Use it if it looks like an improvement. If not, at least I got some practice out of the deal! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | Merge branch 'improve-ci-yaml-doc' into 'master' Rémy Coutable2017-01-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added hint about the execution order of before_script and artifact restoration. See merge request !8811
| * | | | | | | | | | | | | | | | Added hint about the execution order of before_script and artifact restoration.ahorn422017-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | Merge branch 'add_project_update_hook' into 'master' Rémy Coutable2017-01-264-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a system hook for when a project is updated. See merge request !5711
| * | | | | | | | | | | | | | | | | Add a system hook for when a project is updated.Tommy Beadle2017-01-264-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sends a project_update hook when a repo is updated. This does not include renaming or transferring a project. Those are covered by project_rename and project_transfer. This will get called, however, when the visibility is changed.
* | | | | | | | | | | | | | | | | | Merge branch 'patch-12' into 'master' Rémy Coutable2017-01-261-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make a note to highlight 2FA needs time sync'd See merge request !8810
| * | | | | | | | | | | | | | | | | | make a note to highlight 2FA needs time sync'd [ci skip]Sergio Pieiga2017-01-261-2/+6
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'official-merge-window-contributing-md' into 'master' Rémy Coutable2017-01-261-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "official merge window" from CONTRIBUTING.md [ci skip] See merge request !8816
| * | | | | | | | | | | | | | | | | Remove "official merge window" from CONTRIBUTING.md [ci skip] Adam Niedzielski2017-01-261-8/+0
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not discourage contributors from submitting merge requests anytime they want. Our process for reviewing community contributions no longer depends on the release schedule.
* | | | | | | | | | | | | | | | | Merge branch 'patch-6' into 'master' Rémy Coutable2017-01-261-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add an other ldap configuration example See merge request !6773
| * | | | | | | | | | | | | | | | Add more precision about LDAP configurationDavid2016-10-241-23/+10
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | add an other ldap configuration exampleDavid2016-10-101-1/+21
| | | | | | | | | | | | | | | | |