summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-project-destroy-in-namespace' into 'master'mk-fix-orphaned-projects-on-9-2Robert Speicher2017-09-155-22/+54
* Merge branch 'add-missing-i18n-guidelines' into '9-2-stable'9-2-stableRémy Coutable2017-08-161-0/+6
|\
| * Add missing guidelines for i18n setupadd-missing-i18n-guidelinesRubén Dávila2017-08-141-0/+6
|/
* Merge branch '9-2-stable' of https://gitlab.com/gitlab-org/gitlab-ce into 9-2...James Edwards-Jones2017-08-104-0/+33
|\
| * Merge branch '35342-re2-in-upgrade-docs-9-2' into '9-2-stable'Rémy Coutable2017-08-104-0/+33
| |\
| | * Include RE2 in the upgrade docsNick Thomas2017-08-104-0/+33
* | | Update VERSION to 9.2.10v9.2.10DJ Mountney2017-08-091-1/+1
* | | Update CHANGELOG.md for 9.2.10DJ Mountney2017-08-093-9/+5
* | | Merge branch '9-2-stable-fix-cache' into '9-2-stable'Mike Greiling2017-08-081-0/+4
|/ /
* | Merge branch 'import-symlinks-9-2' into 'security-9-2'James Edwards-Jones2017-08-083-1/+14
* | Merge branch 'rs-alphanumeric-ssh-params-9-2' into 'security-9-2'James Edwards-Jones2017-08-083-0/+47
|/
* Merge branch 'fix-docs-re2-install' into 'master'Rémy Coutable2017-08-011-1/+1
* Update VERSION to 9.2.9v9.2.9James Edwards-Jones2017-07-201-1/+1
* Update CHANGELOG.md for 9.2.9James Edwards-Jones2017-07-202-4/+4
* Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'Sean McGivern2017-07-203-8/+45
* Update VERSION to 9.2.8v9.2.8James Edwards-Jones2017-07-191-1/+1
* Update CHANGELOG.md for 9.2.8James Edwards-Jones2017-07-195-16/+7
* Merge branch 'fix-changelog-entry' into 'security-9-2'Sean McGivern2017-07-191-0/+0
* Merge branch '33323-fix-incorrect-project-authorizations' into 'security-9-2'Douwe Maan2017-07-194-3/+60
* Merge branch 'bvl-security-9-2-remove-appearance-symlink' into 'security-9-2'Douwe Maan2017-07-195-2/+105
* Merge branch '33303-9-2-security-fix' into 'security-9-2'Sean McGivern2017-07-193-0/+44
* Merge branch '24570-use-re2-for-user-supplied-regexp' into 'security-9-2'Douwe Maan2017-07-199-4/+174
* Merge branch 'issue-title-leakage-9-2' into 'security-9-2'Robert Speicher2017-07-1921-124/+93
* Update VERSION to 9.2.7v9.2.7Timothy Andrew2017-06-211-1/+1
* Update CHANGELOG.md for 9.2.7Timothy Andrew2017-06-212-4/+4
* Merge branch '32653-fix-gemfile-lock' into 'master'Grzegorz Bizon2017-06-211-4/+3
* Merge branch '32861-fix-milestone-drag-and-drop-assignees' into 'master'Phil Hughes2017-06-212-11/+23
* Merge branch '33260-allow-admins-to-list-admins' into 'master'Rémy Coutable2017-06-216-4/+53
* Update VERSION to 9.2.6v9.2.6Timothy Andrew2017-06-161-1/+1
* Update CHANGELOG.md for 9.2.6Timothy Andrew2017-06-1613-48/+15
* Merge branch 'patch-23' into '9-2-stable'Sean McGivern2017-06-151-1/+2
|\
| * Improve conflict message in _merge_params.html.hamlLuke "Jared" Bennett2017-06-141-1/+2
| * Port _merge_params.html.haml conflict messagepatch-23Luke "Jared" Bennett2017-06-131-1/+1
|/
* Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11706' i...Timothy Andrew2017-06-135-6/+48
|\
| * Fix merge conflicts on pipeline schedulesfix-9-2-stable-conflicts-for-mr-11706Z.J. van de Weg2017-06-132-10/+2
| * Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'Kamil Trzciński2017-06-135-3/+53
* | Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11744' i...Timothy Andrew2017-06-137-7/+123
|\ \
| * | Use wait_for_ajax instead of wait_for_requestsfix-9-2-stable-conflicts-for-mr-11744Clement Ho2017-06-122-2/+2
| * | Merge branch '9-2-stable' into fix-9-2-stable-conflicts-for-mr-11744Clement Ho2017-06-12109-280/+1049
| |\ \ | | |/
| * | Fix conflictsClement Ho2017-06-081-256/+32
| * | Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' i...Phil Hughes2017-06-087-5/+345
* | | Ignore CVE-2017-5029 in Nokogiriwinh2017-06-131-1/+1
| |/ |/|
* | Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11700' i...Timothy Andrew2017-06-123-2/+61
|\ \
| * | Fix up merge_reqest_tabs import/require conflictsfix-9-2-stable-conflicts-for-mr-11700Eric Eastwood2017-06-122-12/+17
| * | Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into '...Clement Ho2017-06-122-2/+56
* | | Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11964' i...Timothy Andrew2017-06-125-24/+48
|\ \ \
| * | | Merge branch '32995-issue-contents-dynamically-replaced-with-stale-version-af...fix-9-2-stable-conflicts-for-mr-11964Adam Niedzielski2017-06-125-24/+48
| |/ /
* | | Merge branch 'sh-recaptcha-fix-try2' into 'master'Sean McGivern2017-06-123-1/+14
|/ /
* | Merge branch 'counters_cache_invalidation' into 'master' Rémy Coutable2017-06-124-2/+49
* | Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'Phil Hughes2017-06-122-1/+33
View Lorry Controller Status