summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org')rs-dev-issue-2373Robert Speicher2015-06-161-1/+5
* Merge branch 'fix-gitlab-ci-yml' into 'master'Dmitriy Zaporozhets2015-06-153-12/+19
|\
| * Look for .gitlab-ci.yml only if checkout_sha is presentfix-gitlab-ci-ymlDmitriy Zaporozhets2015-06-152-10/+14
| * Dont set checkout sha for removed branch/tagDmitriy Zaporozhets2015-06-151-2/+5
|/
* Merge branch 'blog-post-in-advance' into 'master'Job van der Voort2015-06-151-2/+4
|\
| * Prepare blog post in advanceSytse Sijbrandij2015-06-151-2/+4
* | Merge branch 'fix-ext-issue-tracker-hook' into 'master'Dmitriy Zaporozhets2015-06-152-10/+6
|\ \ | |/ |/|
| * Fix external issue tracker hook/test for HTTPS URLsdgerhardt/gitlab-ce-fix-ext-issue-tracker-hookDaniel Gerhardt2015-06-052-10/+6
* | Fix text align in last push eventDmitriy Zaporozhets2015-06-151-1/+1
* | Merge branch 'update_ssl_ciphers' into 'master'Dmitriy Zaporozhets2015-06-152-1/+2
|\ \
| * | Update SSL ciphers per logjam vulnerability recommendations.update_ssl_ciphersMarin Jankovski2015-06-152-1/+2
* | | Merge branch 'rs-dev-issue-2228' into 'master'Dmitriy Zaporozhets2015-06-1561-412/+901
|\ \ \ | |/ / |/| |
| * | Move CHANGELOG item to 7.13Dmitriy Zaporozhets2015-06-151-3/+5
| * | Fix doc typosrs-dev-issue-2228Robert Speicher2015-06-151-7/+6
| * | Add `allowing_for_delay` helper method for feature specsRobert Speicher2015-06-142-6/+41
| * | Refactor RootControllerRobert Speicher2015-06-131-2/+12
| * | Refactor dashboard_choicesRobert Speicher2015-06-132-21/+26
| * | Remove redundant help text from custom dashboard selectionRobert Speicher2015-06-131-2/+0
| * | Fix alignment of Behavior form; add documentation linkRobert Speicher2015-06-131-2/+4
| * | CHANGELOG for custom Dashboard pageRobert Speicher2015-06-131-0/+2
| * | Move 2FA docs from "Workflow" to "Profile Settings"Robert Speicher2015-06-137-20/+20
| * | Add docs for Profile > PreferencesRobert Speicher2015-06-133-35/+72
| * | Spec the failure cases for PreferencesController#updateRobert Speicher2015-06-132-6/+27
| * | Make the dashboard choice text match the text in the sidebarRobert Speicher2015-06-132-4/+4
| * | Add feature specs for default dashboard preferenceRobert Speicher2015-06-133-10/+54
| * | Add a form field to customize the dashboard preferenceRobert Speicher2015-06-133-2/+53
| * | Account for RootController for dashboard navigation and Dispatch JSRobert Speicher2015-06-132-2/+2
| * | Add RootControllerRobert Speicher2015-06-135-4/+60
| * | Add `dashboard` attribute to User modelRobert Speicher2015-06-136-3/+22
| * | Update markup/styling for syntax highlight theme preferenceRobert Speicher2015-06-132-9/+7
| * | Simplify the javascript behavior for Preference updatingRobert Speicher2015-06-134-14/+18
| * | Fix a few remaining references to the old Theme names/IDsRobert Speicher2015-06-133-8/+9
| * | Remove js handler from Profiles#updateRobert Speicher2015-06-131-1/+0
| * | Add PreferencesHelper moduleRobert Speicher2015-06-138-55/+90
| * | Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher2015-06-1310-97/+136
| * | Consolidate theme stylesheets into oneRobert Speicher2015-06-1311-107/+106
| * | Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-1311-105/+112
| * | Allow login_as helper to accept a User objectRobert Speicher2015-06-131-4/+20
| * | Add Profiles::PreferencesControllerRobert Speicher2015-06-1311-15/+127
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-06-158-18/+41
|\ \ \
| * \ \ Merge branch 'remove-visibility-icons' into 'master'Douwe Maan2015-06-153-6/+3
| |\ \ \
| | * | | Remove visibility icon from projects list on dashboard and group pageremove-visibility-iconsDmitriy Zaporozhets2015-06-123-6/+3
| * | | | Merge branch 'fix-post-receive-external-tracker' into 'master'Douwe Maan2015-06-155-11/+37
| |\ \ \ \
| | * | | | Fix post-receive errors on a push when an external issue tracker is configuredStan Hu2015-06-125-11/+37
| * | | | | Merge branch 'update-irker-home' into 'master'Robert Schilling2015-06-151-1/+1
| |\ \ \ \ \
| | * | | | | Update Irker home pageStan Hu2015-06-141-1/+1
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'remove_all_projects_button' into 'master'Douwe Maan2015-06-151-3/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove button to all projects on Trending Projects page.Nicolas2015-06-141-3/+0
|/ / / / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-1418-77/+75
|\ \ \ \ \
| * \ \ \ \ Merge branch 'rs-issue-1432' into 'master'Dmitriy Zaporozhets2015-06-142-3/+3
| |\ \ \ \ \
View Lorry Controller Status