summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-2713-104/+93
|\
| * Merge branch 'forked-event' into 'master'Dmitriy Zaporozhets2015-04-271-1/+1
| |\
| | * Use Projects::CreateService to fork projects so that after-create hooks are run.forked-eventDouwe Maan2015-04-241-1/+1
| * | Place the logo's tooltip dynamicallyrs-minor-stylesRobert Speicher2015-04-251-1/+1
| * | Add data-placement attributes for all sidebar linksRobert Speicher2015-04-259-70/+70
| * | Add collapsed navbar links to the default tooltip selectorRobert Speicher2015-04-251-4/+0
| * | There's no longer a reason to re-render the header on Design updatesRobert Speicher2015-04-251-3/+0
| * | Remove the `has_bottom_tooltip` classRobert Speicher2015-04-252-13/+10
| * | Fix Profile > Design live-updatingRobert Speicher2015-04-251-1/+1
| * | Items with tooltips don't need a 'data-original-title' attributeRobert Speicher2015-04-251-22/+21
* | | Add new admin settingsVinnie Okada2015-04-2612-61/+43
|/ /
* | Merge branch 'mobile-ui-improvements' into 'master'Dmitriy Zaporozhets2015-04-243-32/+34
|\ \ | |/ |/|
| * Improve mobile UI for dashboard and project pagesDmitriy Zaporozhets2015-04-243-32/+34
* | Merge branch 'add_count_to_state_filters' into 'master'Marin Jankovski2015-04-241-3/+3
|\ \ | |/ |/|
| * Add issue and merge request count for state filters.Marin Jankovski2015-04-241-3/+3
* | Merge branch 'commit-project' into 'master'Douwe Maan2015-04-243-4/+4
|\ \
| * | No longer needed to pass project argument to commit methods.Douwe Maan2015-04-241-1/+1
| * | Let commit model know about its project.Douwe Maan2015-04-242-3/+3
| |/
* | Merge pull request #9065 from rumpelsepp/issuesDmitriy Zaporozhets2015-04-242-31/+28
|\ \ | |/ |/|
| * Tweak merge requestsStefan Tatschner2015-04-241-11/+15
| * Tweak issue pageStefan Tatschner2015-04-241-20/+13
* | Merge branch 'atom-feeds-everywhere' into 'master'Dmitriy Zaporozhets2015-04-2420-48/+114
|\ \
| * | Remove unnecessary private_token params.atom-feeds-everywhereDouwe Maan2015-04-237-7/+7
| * | Rename "News Feed" buttons to "Activity Feed"Douwe Maan2015-04-233-3/+3
| * | Fix project atom link tag.Douwe Maan2015-04-231-1/+1
| * | Make links and titles of atom feeds consistent.Douwe Maan2015-04-2311-31/+31
| * | Add atom feed for project activity.Douwe Maan2015-04-232-0/+24
| * | Move activity feed buttons out of event_filter into actual show views.Douwe Maan2015-04-234-14/+20
| * | Add feed button to dashboard and group issue pages.Douwe Maan2015-04-232-0/+12
| * | Add atom link tag to every page that has one.Douwe Maan2015-04-239-10/+34
* | | Use fixed width icons in all nav sidebarsRobert Speicher2015-04-237-55/+54
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-04-231-1/+1
|\ \
| * \ Merge branch 'rs-rails-env-predicates' into 'master'Dmitriy Zaporozhets2015-04-231-1/+1
| |\ \
| | * | Fix two places where we should be using `Rails.env.development?`rs-rails-env-predicatesRobert Speicher2015-04-201-1/+1
| | |/
* | | Merge pull request #9062 from fgimian/omniauth-disable-turbolinkDmitriy Zaporozhets2015-04-231-1/+1
|\ \ \ | |/ / |/| |
| * | Disable turbolinks for omniauth link to avoid rendering problemsFotis Gimian2015-03-311-1/+1
* | | Merge branch 'master' into new-sidebarDmitriy Zaporozhets2015-04-237-81/+111
|\ \ \
| * \ \ Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-223-74/+74
| |\ \ \
| | * | | added fieldset support to project and admin services views.Ioannis Kappas2015-04-223-74/+74
| * | | | Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-221-1/+9
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add 'reply' hotkey to help modalRobert Speicher2015-04-181-0/+8
| | * | | Fix 'merge_reuests' typoRobert Speicher2015-04-181-1/+1
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-04-221-2/+2
| |\ \ \ \
| | * | | | Fix tab behavior on MergeRequests#newrs-toggle-tabRobert Speicher2015-04-211-2/+2
| * | | | | Merge pull request #9164 from dsander/fix-markdown-previewJeroen van Baarsen2015-04-221-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make issue preview look like the resultDominik Sander2015-04-211-1/+1
| | | |_|/ | | |/| |
| * | | | Improve description of Google Code import user map.Douwe Maan2015-04-211-3/+25
| |/ / /
* | | | Dont render dashbaord nav if user is not signed inDmitriy Zaporozhets2015-04-231-1/+1
* | | | For navless pages render dashboard navDmitriy Zaporozhets2015-04-224-25/+21
* | | | Fix wording and remove duplicate linkDmitriy Zaporozhets2015-04-222-4/+2
View Lorry Controller Status