summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add SMTP upgrade informationStan Hu2016-06-281-0/+13
* Merge remote-tracking branch 'dev/master'Robert Speicher2016-06-2710-9/+154
|\
| * Merge branch 'fix-18997' into 'master' Robert Speicher2016-06-274-2/+113
| |\
| | * Update CHANGELOGDouglas Barbosa Alexandre2016-06-221-0/+3
| | * Fix visibility of private project snippets for members when searchingDouglas Barbosa Alexandre2016-06-223-20/+68
| | * Fix internal snippets can be searched by anyoneDouglas Barbosa Alexandre2016-06-223-2/+62
| * | Merge branch '19102-fix' into 'master' Robert Speicher2016-06-276-6/+42
| |\ \
| | * | Fix an information disclosure when requesting access to a group containing pr...Rémy Coutable2016-06-246-6/+42
* | | | Merge branch 'rename_license_template_api' into 'master' Robert Speicher2016-06-273-4/+4
|\ \ \ \
| * | | | Rename Licenses API to License Templates APIDrew Blessing2016-06-273-4/+4
|/ / / /
* | | | Merge branch 'issue_18398' into 'master' Douwe Maan2016-06-273-0/+33
|\ \ \ \
| * | | | Check for conflict with wiki projects when creating a new project.issue_18398Ruben Davila2016-06-273-0/+33
* | | | | Merge branch 'regex-find-replace-http-matcher' into 'master' Robert Speicher2016-06-2767-1015/+1015
|\ \ \ \ \
| * | | | | Use HTTP matchers if possibleZ.J. van de Weg2016-06-2767-1015/+1015
* | | | | | Merge branch 'cherry-pick-5734e266' into 'master' Robert Speicher2016-06-272-1/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update CHANGELOGDouwe Maan2016-06-271-0/+1
| * | | | | Fix rendering of commit notesDouwe Maan2016-06-271-1/+8
* | | | | | Merge branch 'emoji-menu-stick-search' into 'master' Jacob Schatz2016-06-276-19/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Updated award emoji testsemoji-menu-stick-searchPhil Hughes2016-06-241-3/+1
| * | | | | Fixed award emoji testsPhil Hughes2016-06-202-2/+1
| * | | | | Made the search bar on emoji menu stickyPhil Hughes2016-06-203-14/+15
* | | | | | Merge branch 'update-omniauth-saml' into 'master' Stan Hu2016-06-273-6/+8
|\ \ \ \ \ \
| * | | | | | Updated CHANGELOGPatricio Cano2016-06-271-0/+3
| * | | | | | Update omniauth-saml to 1.6.0 to address a security vulnerability in ruby-samlPatricio Cano2016-06-272-6/+5
* | | | | | | Merge branch 'mark-done-todo-id' into 'master' Robert Speicher2016-06-271-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Correctly returns todo ID after creating todomark-done-todo-idPhil Hughes2016-06-271-1/+2
* | | | | | | | Merge branch '19075-new-wiki' into 'master' Fatih Acet2016-06-272-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed duplicate Changelog entriesAnnabel Dunstone2016-06-271-12/+0
| * | | | | | | | Add conditional for new pag linkAnnabel Dunstone2016-06-271-0/+4
| * | | | | | | | Update changelogAnnabel Dunstone2016-06-271-0/+13
| * | | | | | | | Remove duplicate new page btn from edit wikiAnnabel Dunstone2016-06-271-3/+0
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'workhorse-gmake' into 'master' Stan Hu2016-06-271-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Mention gmakeJacob Vosmaer2016-06-271-0/+4
* | | | | | | | | Merge branch 'new-branch-check-fix' into 'master' Fatih Acet2016-06-272-1/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix check for existence of new branch button (!4630)winniehell2016-06-272-1/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'revert-sri' into 'master' Jacob Schatz2016-06-273-5/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Revert Subresource Integrity pending a fix for Firefox's incorrect hashing im...revert-sriConnor Shea2016-06-273-5/+4
| |/ / / / / /
* | | | | | | Merge branch 'fix/sidekiq-mem-killer-debug' into 'master' Rémy Coutable2016-06-271-2/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/sidekiq-mem...James Lopez2016-06-2795-292/+1546
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | better debugging for memory killer middlewarefix/sidekiq-mem-killer-debugJames Lopez2016-06-271-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'image-sizing' into 'master' Rémy Coutable2016-06-277-2/+19
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Wrap images in divs with Banzai and limit max-height.image-sizingConnor Shea2016-06-277-2/+19
* | | | | | | Merge branch 'test-gitlab-ci-ymls' into 'master' Rémy Coutable2016-06-271-0/+12
|\ \ \ \ \ \ \
| * | | | | | | Test templates and GitLabCI parser againts each othertest-gitlab-ci-ymlsZ.J. van de Weg2016-06-271-0/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fix-changelog-entries' into 'master' Rémy Coutable2016-06-271-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove duplicate changelog entryfix-changelog-entriesRobert Schilling2016-06-271-1/+0
* | | | | | | | Merge branch 'case-insensitive-ci-skip' into 'master' Rémy Coutable2016-06-274-4/+51
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add support for "skip ci" tooSimon Welsh2016-06-254-5/+36
| * | | | | | | Allow "ci skip" to be in any caseSimon Welsh2016-06-254-3/+19
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'update-ee-downgrade-instructions' into 'master' Achilleas Pipinellis2016-06-271-2/+2
|\ \ \ \ \ \ \
View Lorry Controller Status