summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add ActiveRecord::Migration.maintain_test_schema! to spec_helperRobert Speicher2015-03-271-0/+2
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-264-13/+37
|\
| * Merge branch 'master' into 'master'Sytse (admin)2015-03-264-13/+37
| |\
| | * Separate Dockerfile for Data and ApplicationJozef Vaclavik2015-03-204-13/+37
* | | Add a note about not adding new setting options to gitlab.yml.Marin Jankovski2015-03-261-0/+5
|/ /
* | Merge branch 'set-default-url-options' into 'master'Dmitriy Zaporozhets2015-03-262-0/+13
|\ \
| * | Set Application controller default URL options to ensure all url_for calls ar...Stan Hu2015-03-252-0/+13
* | | Merge branch 'fix-emailsonpush' into 'master'Dmitriy Zaporozhets2015-03-262-1/+12
|\ \ \
| * | | Fix EmailsOnPush.fix-emailsonpushDouwe Maan2015-03-262-1/+10
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-266-2/+28
|\ \ \ \
| * \ \ \ Merge branch 'capitalize-js-class' into 'master'Dmitriy Zaporozhets2015-03-262-2/+2
| |\ \ \ \
| | * | | | Capitalize js class namecapitalize-js-classDmitriy Zaporozhets2015-03-252-2/+2
| * | | | | Merge branch 'fix-side-by-side-diff' into 'master'Hannes Rosenögger2015-03-264-0/+26
| |\ \ \ \ \
| | * | | | | Fix broken side-by-side diff view on merge request pageStan Hu2015-03-254-0/+26
| | |/ / / /
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-263-19/+26
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #9029 from tsigo/rs-project-adminDmitriy Zaporozhets2015-03-261-1/+6
| |\ \ \ \ \ \
| | * | | | | | Update the "Edit Group" button class on Project Admin pageRobert Speicher2015-03-251-1/+1
| | * | | | | | Add archived status to Admin > Project pageRobert Speicher2015-03-251-0/+5
| * | | | | | | Merge pull request #9034 from buildkite/rename-buildbox-to-buildkiteDmitriy Zaporozhets2015-03-262-18/+20
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Renamed Buildbox to Buildkite.Keith Pitt2015-03-262-18/+20
* | | | | | | | Merge branch 'backup-chdir' into 'master'Dmitriy Zaporozhets2015-03-262-7/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Change directory when removing old backupsVinnie Okada2015-03-242-7/+9
* | | | | | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-03-2611-52/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix diff header for discussionDmitriy Zaporozhets2015-03-252-2/+8
| * | | | | | | | Remove unused doorkeeper layoutDmitriy Zaporozhets2015-03-252-37/+0
| * | | | | | | | Nicer wellDmitriy Zaporozhets2015-03-251-0/+6
| * | | | | | | | Replace alerts with well where alert is not neededDmitriy Zaporozhets2015-03-256-13/+10
|/ / / / / / / /
* | | | | | | | Improve protected branches page UXDmitriy Zaporozhets2015-03-251-3/+3
* | | | | | | | Dont bind all checkboxes when you need only protected branchesDmitriy Zaporozhets2015-03-251-1/+1
* | | | | | | | Merge branch 'prevent-duobling-ready-events' into 'master'Dmitriy Zaporozhets2015-03-269-22/+13
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Prevent unnecessary doubling of js events on import pages and user calendarprevent-duobling-ready-eventsDmitriy Zaporozhets2015-03-259-22/+13
|/ / / / / / /
* | | | | | | Merge branch 'fix-compare-diff-unfold' into 'master'Dmitriy Zaporozhets2015-03-264-0/+20
|\ \ \ \ \ \ \
| * | | | | | | Fix code unfold not working on Compare commits pageStan Hu2015-03-244-0/+20
* | | | | | | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-03-261-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Change ordering so that confirm is removed from attrs before attempting to Us...RICKETTM@uk.ibm.com2015-03-241-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'doc_group_permissions' into 'master'Dmitriy Zaporozhets2015-03-261-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | [doc] Groups can be browsable if they contain at least one public project.Achilleas Pipinellis2015-03-251-2/+5
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'notification_on_project_moving' into 'master'Dmitriy Zaporozhets2015-03-261-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | notification on project movingnotification_on_project_movingValery Sizov2015-03-251-0/+3
* | | | | | | | | Merge branch 'fix-branch-contains' into 'master'Dmitriy Zaporozhets2015-03-262-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Prevent doubling AJAX request with each commit visit via Turbolinkfix-branch-containsDmitriy Zaporozhets2015-03-252-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #9021 from nicklegr/faster_auto_mergeDmitriy Zaporozhets2015-03-252-5/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Update CHANGELOGnicklegr2015-03-251-0/+1
| * | | | | | | Reset parking branch to HEAD everytimenicklegr2015-03-251-5/+1
* | | | | | | | Merge pull request #8007 from mr-vinn/markdown-tagsDmitriy Zaporozhets2015-03-255-10/+58
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-2485-530/+829
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-2246-141/+466
| |\ \ \ \ \ \ \
| * | | | | | | | Fix SanitizationFilter bugsVinnie Okada2015-03-221-1/+2
| * | | | | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-21131-1414/+1117
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Don't allow style attributes in inline HTMLVinnie Okada2015-03-212-1/+2