summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Bootlint: Fix incorrectly nested `form-group` elementRobert Speicher2015-06-161-2/+2
* Bootlint: Add missing `type` attribute for buttonsRobert Speicher2015-06-162-1/+3
* Bootlint: Modals no longer need a '.hide' classRobert Speicher2015-06-168-8/+8
* Bootlint: Use offset grid classes instead of empty divsRobert Speicher2015-06-1610-18/+10
* Merge branch 'support-comment-parallel-diff' into 'master'Douwe Maan2015-06-165-20/+26
|\
| * Support commenting on a diff in side-by-side viewStan Hu2015-06-165-20/+26
* | Merge branch 'header_layout_issue' into 'master'Douwe Maan2015-06-162-5/+4
|\ \
| * | Fix layout issue in header title truncation.Nicolas2015-06-162-5/+4
| |/
* | Merge branch 'applications_form' into 'master'Douwe Maan2015-06-163-14/+25
|\ \ | |/ |/|
| * Fix consistency issues on New Application page.Nicolas2015-06-152-3/+9
| * Fix layout issue when New Application validation fails.Nicolas2015-06-151-10/+15
| * Highlight Applications nav item when validation fails.Nicolas2015-06-141-1/+1
* | Fix text align in last push eventDmitriy Zaporozhets2015-06-151-1/+1
* | Merge branch 'rs-dev-issue-2228' into 'master'Dmitriy Zaporozhets2015-06-159-69/+62
|\ \
| * | 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
| * | Add feature specs for default dashboard preferenceRobert Speicher2015-06-132-1/+6
| * | Add a form field to customize the dashboard preferenceRobert Speicher2015-06-131-2/+17
| * | Account for RootController for dashboard navigation and Dispatch JSRobert Speicher2015-06-131-1/+1
| * | Add RootControllerRobert Speicher2015-06-131-1/+1
| * | Update markup/styling for syntax highlight theme preferenceRobert Speicher2015-06-131-2/+2
| * | Simplify the javascript behavior for Preference updatingRobert Speicher2015-06-132-8/+7
| * | Fix a few remaining references to the old Theme names/IDsRobert Speicher2015-06-131-1/+1
| * | Add PreferencesHelper moduleRobert Speicher2015-06-133-5/+5
| * | Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher2015-06-132-33/+6
| * | Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-134-61/+59
| * | Add Profiles::PreferencesControllerRobert Speicher2015-06-133-3/+6
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-06-151-2/+0
|\ \
| * \ Merge branch 'remove-visibility-icons' into 'master'Douwe Maan2015-06-151-2/+0
| |\ \ | | |/ | |/|
| | * Remove visibility icon from projects list on dashboard and group pageremove-visibility-iconsDmitriy Zaporozhets2015-06-121-2/+0
* | | Remove button to all projects on Trending Projects page.Nicolas2015-06-141-3/+0
|/ /
* | Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-121-0/+5
|\ \
| * | session_expire_seconds => session_expire_delaythemaze752015-06-101-2/+3
| * | Add session expiration delay configuration through UI applicationEric Maziade2015-06-051-0/+4
* | | 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-1222-200/+229
|\ \ \ \
| * | | | Fix automergeDmitriy Zaporozhets2015-06-111-4/+3
| * | | | Improve variables in mr widgetDmitriy Zaporozhets2015-06-113-3/+3
| * | | | Extract merge request widget JS to separate classDmitriy Zaporozhets2015-06-118-17/+38
| * | | | Refactor merge request widget step 2Dmitriy Zaporozhets2015-06-1114-50/+46
| * | | | Refactor accept merge request widgetDmitriy Zaporozhets2015-06-1122-191/+204
* | | | | Merge branch 'rs-issue-1757' into 'master'Dmitriy Zaporozhets2015-06-111-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add negative tabindex to Markdown Write and Preview tabsrs-issue-1757Robert Speicher2015-06-101-2/+2
| |/ / /
* | | | Merge branch 'rs-issue-1758' into 'master'Dmitriy Zaporozhets2015-06-111-6/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Update grids for 2FA detailsRobert Speicher2015-06-101-6/+7
| |/ /
* | | Merge branch 'project_settings_icons_alignment' into 'master'Douwe Maan2015-06-101-5/+5
|\ \ \ | |/ / |/| |
| * | Fix alignment of Project Settings nav icons.Nicolas2015-06-101-5/+5