summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'SAML_1888' into 'master'saml_social_providerMarin Jankovski2015-06-261-1/+1
* Merge branch '7-12-fix-delete-user-error' into '7-12-stable'Jacob Vosmaer2015-06-236-5/+38
|\
| * Fix CHANGELOGStan Hu2015-06-231-3/+5
| * Fix error when deleting a user who has projectsStan Hu2015-06-236-3/+34
|/
* Merge branch 'ext-issue-7-12' into '7-12-stable'Jacob Vosmaer2015-06-223-1/+13
|\
| * Fix hooks for web based events with external issue referencesext-issue-7-12Daniel Gerhardt2015-06-163-1/+13
* | Merge branch 'rename-mr-tabs' into '7-12-stable'Jacob Vosmaer2015-06-2215-43/+43
|\ \
| * | Fix merge requests API scope to keep compatibility in 7.12.x patch releaserename-mr-tabsDmitriy Zaporozhets2015-06-221-1/+1
| * | Fix closed merge request scope at milestone pageDmitriy Zaporozhets2015-06-221-1/+1
| * | Revert merge request states renamingDmitriy Zaporozhets2015-06-2214-41/+41
* | | Merge branch '7-12-fix-post-receive-external-tracker' into '7-12-stable'Jacob Vosmaer2015-06-225-11/+37
|\ \ \ | |/ / |/| |
| * | Fix post-receive errors on a push when an external issue tracker is configuredStan Hu2015-06-205-11/+37
* | | Version 7.12.0v7.12.0Jacob Vosmaer2015-06-221-1/+1
* | | Merge branch '7-12-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-12-stableJacob Vosmaer2015-06-224-4/+19
|\ \ \
| * | | Merge branch 'web-editor-autocrlf' into 'master'Dmitriy Zaporozhets2015-06-224-4/+19
| |/ /
* | | Merge branch '7-12-new-mr-disable-change-target-branch' into '7-12-stable'Jacob Vosmaer2015-06-222-6/+8
|\ \ \
| * | | Disable changing of target branch in new merge request page when a branch has...Stan Hu2015-06-202-6/+8
| |/ /
* | | Merge branch '7-12-fix-error-500-internal-snippet' into '7-12-stable'Jacob Vosmaer2015-06-226-2/+43
|\ \ \ | |/ / |/| |
| * | Fix Error 500 when one user attempts to access a personal, internal snippetStan Hu2015-06-206-2/+43
|/ /
* | Version 7.12.0.rc3v7.12.0.rc3Jacob Vosmaer2015-06-181-1/+1
* | Merge branch 'labels-permission-fix-7-12' into '7-12-stable'Jacob Vosmaer2015-06-184-7/+43
|\ \
| * | Fix 403 Access Denied error messages when accessing Labels section in a proje...Stan Hu2015-06-184-7/+43
|/ /
* | Merge branch 'ldap-person-fix-7-12' into '7-12-stable'Jacob Vosmaer2015-06-182-50/+61
|\ \
| * | Merge branch 'fix/oauth_user_ldap_person' into 'master'ldap-person-fix-7-12Douwe Maan2015-06-182-50/+61
|/ /
* | Merge branch 'rs-custom-dashboard-backport' into '7-12-stable'Douwe Maan2015-06-1834-132/+536
|\ \
| * | Fix Preferences feature specrs-custom-dashboard-backportRobert Speicher2015-06-161-10/+8
| * | Fix preferences/showRobert Speicher2015-06-161-5/+6
| * | Fix doc typosRobert Speicher2015-06-161-7/+6
| * | Add `allowing_for_delay` helper method for feature specsRobert Speicher2015-06-162-6/+41
| * | Refactor RootControllerRobert Speicher2015-06-161-2/+12
| * | Refactor dashboard_choicesRobert Speicher2015-06-162-21/+26
| * | Remove redundant help text from custom dashboard selectionRobert Speicher2015-06-161-2/+0
| * | Fix alignment of Behavior form; add documentation linkRobert Speicher2015-06-161-2/+4
| * | Move 2FA docs from "Workflow" to "Profile Settings"Robert Speicher2015-06-167-20/+20
| * | Add docs for Profile > PreferencesRobert Speicher2015-06-163-35/+72
| * | Spec the failure cases for PreferencesController#updateRobert Speicher2015-06-162-6/+27
| * | Make the dashboard choice text match the text in the sidebarRobert Speicher2015-06-162-4/+4
| * | Add feature specs for default dashboard preferenceRobert Speicher2015-06-163-10/+54
| * | Add a form field to customize the dashboard preferenceRobert Speicher2015-06-163-2/+58
| * | Account for RootController for dashboard navigation and Dispatch JSRobert Speicher2015-06-162-2/+2
| * | Add RootControllerRobert Speicher2015-06-165-4/+60
| * | Add `dashboard` attribute to User modelRobert Speicher2015-06-166-5/+25
| * | Simplify the javascript behavior for Preference updatingRobert Speicher2015-06-164-15/+19
| * | Remove js handler from Profiles#updateRobert Speicher2015-06-161-1/+0
| * | Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-1611-105/+112
| * | Add Profiles::PreferencesControllerRobert Speicher2015-06-1611-15/+127
* | | Merge branch 'bump-gems' into '7-12-stable'Dmitriy Zaporozhets2015-06-172-34/+37
|\ \ \ | |/ / |/| |
| * | Merge branch 'rs-rails-update' into 'master'bump-gemsDmitriy Zaporozhets2015-06-172-34/+37
|/ /
* | Version 7.12.0.rc2v7.12.0.rc2Jacob Vosmaer2015-06-161-1/+1
* | Merge branch 'kerberos_require' into '7-12-stable'Dmitriy Zaporozhets2015-06-161-0/+8
|\ \
View Lorry Controller Status