summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge branch 'require_kerberos_when_enabled' into 'master'kerberos_requireDmitriy Zaporozhets2015-06-161-0/+8
* | Merge branch '7-12-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-12-stableDmitriy Zaporozhets2015-06-164-36/+52
|\ \ | |/
| * Merge branch '7-12-rc2' into '7-12-stable'Dmitriy Zaporozhets2015-06-155-38/+57
| |\
| | * Fix .gitlab-ci.yml fileDmitriy Zaporozhets2015-06-151-25/+37
| | * Fix typo on account page.Nicolas2015-06-151-1/+1
| | * Merge branch 'fix-gitlab-ci-yml' into 'master'Dmitriy Zaporozhets2015-06-153-12/+19
| |/
* | Dont set checkout sha for removed branch/tagDmitriy Zaporozhets2015-06-151-2/+5
|/
* Version 7.12.0.rc1v7.12.0.rc1Jacob Vosmaer2015-06-121-1/+1
* Merge branch 'update-install-docs' into 'master'Marin Jankovski2015-06-121-4/+4
|\
| * New source installs should use 7-12-stableJacob Vosmaer2015-06-121-2/+2
| * Install git 2.4.3Jacob Vosmaer2015-06-121-2/+2
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-1270-831/+831
|\
| * Merge branch 'rs-expect-syntax-features' into 'master'Dmitriy Zaporozhets2015-06-1270-831/+831
| |\
| | * Call `page.all` instead of `all` in feature stepsRobert Speicher2015-06-1210-12/+12
| | * Change `within` to `page.within` in feature stepsRobert Speicher2015-06-1234-159/+159
| | * Update all `should`-style syntax to `expect` in featuresRobert Speicher2015-06-1269-662/+662
| |/
* | Merge branch 'remove-activity-feed-text' into 'master'Dmitriy Zaporozhets2015-06-123-3/+0
|\ \
| * | Remove text since rss is now to prominent.Sytse Sijbrandij2015-06-123-3/+0
* | | Merge branch 'rc1-release-doc-link' into 'master'Job van der Voort2015-06-121-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix link to howto_rc1.mdJacob Vosmaer2015-06-121-1/+1
|/ /
* | Merge branch 'note_about_omnibus_changes' into 'master'Dmitriy Zaporozhets2015-06-128-4/+31
|\ \
| * | Add a note that changing example configuration files requires changing omnibu...note_about_omnibus_changesMarin Jankovski2015-06-118-4/+31
* | | Merge branch 'refactor-mr-widget' into 'master'Dmitriy Zaporozhets2015-06-1228-299/+306
|\ \ \
View Lorry Controller Status