summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-ext-issue-tracker-hook' into 'master'Dmitriy Zaporozhets2015-06-151-10/+5
|\
| * Fix external issue tracker hook/test for HTTPS URLsdgerhardt/gitlab-ce-fix-ext-issue-tracker-hookDaniel Gerhardt2015-06-051-10/+5
* | Fix text align in last push eventDmitriy Zaporozhets2015-06-151-1/+1
* | Merge branch 'rs-dev-issue-2228' into 'master'Dmitriy Zaporozhets2015-06-1529-224/+312
|\ \
| * | Refactor RootControllerRobert Speicher2015-06-131-2/+12
| * | Refactor dashboard_choicesRobert Speicher2015-06-131-13/+16
| * | 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
| * | Spec the failure cases for PreferencesController#updateRobert Speicher2015-06-131-4/+9
| * | Make the dashboard choice text match the text in the sidebarRobert Speicher2015-06-131-2/+2
| * | Add feature specs for default dashboard preferenceRobert Speicher2015-06-132-1/+6
| * | Add a form field to customize the dashboard preferenceRobert Speicher2015-06-132-2/+36
| * | Account for RootController for dashboard navigation and Dispatch JSRobert Speicher2015-06-132-2/+2
| * | Add RootControllerRobert Speicher2015-06-132-1/+19
| * | Add `dashboard` attribute to User modelRobert Speicher2015-06-132-1/+7
| * | Update markup/styling for syntax highlight theme preferenceRobert Speicher2015-06-132-9/+7
| * | Simplify the javascript behavior for Preference updatingRobert Speicher2015-06-133-14/+10
| * | Fix a few remaining references to the old Theme names/IDsRobert Speicher2015-06-131-1/+1
| * | Remove js handler from Profiles#updateRobert Speicher2015-06-131-1/+0
| * | Add PreferencesHelper moduleRobert Speicher2015-06-136-34/+37
| * | Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher2015-06-134-41/+12
| * | Consolidate theme stylesheets into oneRobert Speicher2015-06-1311-107/+106
| * | Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-137-70/+79
| * | Add Profiles::PreferencesControllerRobert Speicher2015-06-134-3/+35
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-06-154-17/+17
|\ \ \
| * \ \ Merge branch 'remove-visibility-icons' into 'master'Douwe Maan2015-06-152-6/+0
| |\ \ \
| | * | | Remove visibility icon from projects list on dashboard and group pageremove-visibility-iconsDmitriy Zaporozhets2015-06-122-6/+0
| * | | | Merge branch 'fix-post-receive-external-tracker' into 'master'Douwe Maan2015-06-152-11/+17
| |\ \ \ \
| | * | | | Fix post-receive errors on a push when an external issue tracker is configuredStan Hu2015-06-122-11/+17
* | | | | | Remove button to all projects on Trending Projects page.Nicolas2015-06-141-3/+0
|/ / / / /
* | | | | Merge pull request #9340 from jvanbaarsen/update-noteableDmitriy Zaporozhets2015-06-141-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update noteable after a new note is addedJeroen van Baarsen2015-06-051-1/+1
* | | | | Ensure `session_expire_delay` field exists before accessing itrs-issue-1798Robert Speicher2015-06-131-4/+4
* | | | | Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-123-0/+12
|\ \ \ \ \
| * | | | | session_expire_seconds => session_expire_delaythemaze752015-06-103-5/+10
| * | | | | Add session expiration delay configuration through UI applicationEric Maziade2015-06-053-0/+7
* | | | | | 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 '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 'refactor-mr-widget' into 'master'Dmitriy Zaporozhets2015-06-1227-298/+304
|\ \ \ \ \ \ \
| * | | | | | | Fix automergeDmitriy Zaporozhets2015-06-112-5/+4
| * | | | | | | Improve variables in mr widgetDmitriy Zaporozhets2015-06-115-15/+8
| * | | | | | | Fix rubocopDmitriy Zaporozhets2015-06-111-2/+1
| * | | | | | | Extract merge request widget JS to separate classDmitriy Zaporozhets2015-06-1111-87/+96
| * | | | | | | Refactor merge request widget step 2Dmitriy Zaporozhets2015-06-1117-75/+60
| * | | | | | | Refactor accept merge request widgetDmitriy Zaporozhets2015-06-1123-191/+212
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-123-4/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fix-graph-width' into 'master'Dmitriy Zaporozhets2015-06-121-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix graph width on different screen sizesfix-graph-widthDmitriy Zaporozhets2015-06-111-2/+2
| | |/ / / / / / /
View Lorry Controller Status