summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 'rs-issue-1798' into 'master'Dmitriy Zaporozhets2015-06-133-12/+12
|\
| * Ensure `session_expire_delay` field exists before accessing itrs-issue-1798Robert Speicher2015-06-133-12/+12
|/
* Merge branch 'regex-anchor-docs' into 'master'Sytse Sijbrandij2015-06-121-0/+30
|\
| * Add info about regex anchors to shell command docs.Douwe Maan2015-06-121-0/+30
|/
* Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-1210-4/+30
|\
| * session_expire_seconds => session_expire_delaythemaze752015-06-1010-16/+25
| * Add session expiration delay configuration through UI applicationEric Maziade2015-06-0510-4/+21
* | Merge branch 'update-guides-7.12' into 'master'Jacob Vosmaer2015-06-122-10/+144
|\ \
| * | Move mention of git 2.1.2 to intro paragraphJacob Vosmaer2015-06-121-5/+4
| * | Add 7.12 update guidesJacob Vosmaer2015-06-122-10/+145
* | | Merge branch 'fix_typo_account_page' into 'master'Douwe Maan2015-06-121-1/+1
|\ \ \
| * | | Fix typo on account page.Nicolas2015-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
|/ / / /