Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add ActiveRecord::Migration.maintain_test_schema! to spec_helper | Robert Speicher | 2015-03-27 | 1 | -0/+2 |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2015-03-26 | 4 | -13/+37 |
|\ | |||||
| * | Merge branch 'master' into 'master' | Sytse (admin) | 2015-03-26 | 4 | -13/+37 |
| |\ | |||||
| | * | Separate Dockerfile for Data and Application | Jozef Vaclavik | 2015-03-20 | 4 | -13/+37 |
* | | | Add a note about not adding new setting options to gitlab.yml. | Marin Jankovski | 2015-03-26 | 1 | -0/+5 |
|/ / | |||||
* | | Merge branch 'set-default-url-options' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 2 | -0/+13 |
|\ \ | |||||
| * | | Set Application controller default URL options to ensure all url_for calls ar... | Stan Hu | 2015-03-25 | 2 | -0/+13 |
* | | | Merge branch 'fix-emailsonpush' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 2 | -1/+12 |
|\ \ \ | |||||
| * | | | Fix EmailsOnPush.fix-emailsonpush | Douwe Maan | 2015-03-26 | 2 | -1/+10 |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-03-26 | 6 | -2/+28 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'capitalize-js-class' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 2 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | Capitalize js class namecapitalize-js-class | Dmitriy Zaporozhets | 2015-03-25 | 2 | -2/+2 |
| * | | | | | Merge branch 'fix-side-by-side-diff' into 'master' | Hannes Rosenögger | 2015-03-26 | 4 | -0/+26 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix broken side-by-side diff view on merge request page | Stan Hu | 2015-03-25 | 4 | -0/+26 |
| | |/ / / / | |||||
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-03-26 | 3 | -19/+26 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #9029 from tsigo/rs-project-admin | Dmitriy Zaporozhets | 2015-03-26 | 1 | -1/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Update the "Edit Group" button class on Project Admin page | Robert Speicher | 2015-03-25 | 1 | -1/+1 |
| | * | | | | | | Add archived status to Admin > Project page | Robert Speicher | 2015-03-25 | 1 | -0/+5 |
| * | | | | | | | Merge pull request #9034 from buildkite/rename-buildbox-to-buildkite | Dmitriy Zaporozhets | 2015-03-26 | 2 | -18/+20 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Renamed Buildbox to Buildkite. | Keith Pitt | 2015-03-26 | 2 | -18/+20 |
* | | | | | | | | Merge branch 'backup-chdir' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 2 | -7/+9 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Change directory when removing old backups | Vinnie Okada | 2015-03-24 | 2 | -7/+9 |
* | | | | | | | | Merge branch 'ui-improvements' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 11 | -52/+24 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix diff header for discussion | Dmitriy Zaporozhets | 2015-03-25 | 2 | -2/+8 |
| * | | | | | | | | Remove unused doorkeeper layout | Dmitriy Zaporozhets | 2015-03-25 | 2 | -37/+0 |
| * | | | | | | | | Nicer well | Dmitriy Zaporozhets | 2015-03-25 | 1 | -0/+6 |
| * | | | | | | | | Replace alerts with well where alert is not needed | Dmitriy Zaporozhets | 2015-03-25 | 6 | -13/+10 |
|/ / / / / / / / | |||||
* | | | | | | | | Improve protected branches page UX | Dmitriy Zaporozhets | 2015-03-25 | 1 | -3/+3 |
* | | | | | | | | Dont bind all checkboxes when you need only protected branches | Dmitriy Zaporozhets | 2015-03-25 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'prevent-duobling-ready-events' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 9 | -22/+13 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Prevent unnecessary doubling of js events on import pages and user calendarprevent-duobling-ready-events | Dmitriy Zaporozhets | 2015-03-25 | 9 | -22/+13 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'fix-compare-diff-unfold' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 4 | -0/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix code unfold not working on Compare commits page | Stan Hu | 2015-03-24 | 4 | -0/+20 |
* | | | | | | | | Merge branch 'master' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Change ordering so that confirm is removed from attrs before attempting to Us... | RICKETTM@uk.ibm.com | 2015-03-24 | 1 | -2/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'doc_group_permissions' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | [doc] Groups can be browsable if they contain at least one public project. | Achilleas Pipinellis | 2015-03-25 | 1 | -2/+5 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'notification_on_project_moving' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | notification on project movingnotification_on_project_moving | Valery Sizov | 2015-03-25 | 1 | -0/+3 |
* | | | | | | | | | Merge branch 'fix-branch-contains' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Prevent doubling AJAX request with each commit visit via Turbolinkfix-branch-contains | Dmitriy Zaporozhets | 2015-03-25 | 2 | -2/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #9021 from nicklegr/faster_auto_merge | Dmitriy Zaporozhets | 2015-03-25 | 2 | -5/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Update CHANGELOG | nicklegr | 2015-03-25 | 1 | -0/+1 |
| * | | | | | | | Reset parking branch to HEAD everytime | nicklegr | 2015-03-25 | 1 | -5/+1 |
* | | | | | | | | Merge pull request #8007 from mr-vinn/markdown-tags | Dmitriy Zaporozhets | 2015-03-25 | 5 | -10/+58 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into markdown-tags | Vinnie Okada | 2015-03-24 | 85 | -530/+829 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' into markdown-tags | Vinnie Okada | 2015-03-22 | 46 | -141/+466 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix SanitizationFilter bugs | Vinnie Okada | 2015-03-22 | 1 | -1/+2 |
| * | | | | | | | | Merge branch 'master' into markdown-tags | Vinnie Okada | 2015-03-21 | 131 | -1414/+1117 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Don't allow style attributes in inline HTML | Vinnie Okada | 2015-03-21 | 2 | -1/+2 |