summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* fixed search & starred projetsPhil Hughes2017-07-142-1/+2
* Merge branch 'master' into new-nav-fix-contextual-breadcrumbsPhil Hughes2017-07-1474-212/+251
|\
| * Merge branch 'find-file-no-longer-inline' into 'master'Filipa Lacerda2017-07-145-12/+10
| |\
| | * missed one...find-file-no-longer-inlinePhil Hughes2017-07-131-5/+0
| | * Move find file URL out of global variablePhil Hughes2017-07-134-7/+10
| * | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-1416-31/+37
| |\ \
| | * | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-1316-31/+37
| * | | Fix spacing in sidebarFilipa Lacerda2017-07-142-4/+8
| * | | Handle nil BroadcastMessage.current in the viewsStan Hu2017-07-131-1/+1
| * | | Merge branch 'dm-merge-request-creation-error' into 'master'Stan Hu2017-07-142-7/+32
| |\ \ \
| | * | | Make sure MergeRequest commit methods work when either compare_commits or mer...dm-merge-request-creation-errorDouwe Maan2017-07-132-7/+32
| * | | | Merge branch 'artifacts-download-dropdown-menu-is-too-narrow' into 'master'Clement Ho2017-07-131-1/+2
| |\ \ \ \
| | * | | | Increase width of dropdown menus automatically up to 500 pxThomas Wucher2017-07-131-1/+2
| * | | | | Merge branch 'reload-new-navigation-option-change' into 'master'Filipa Lacerda2017-07-131-0/+3
| |\ \ \ \ \
| | * | | | | Reload page after changing navigation preferencereload-new-navigation-option-changePhil Hughes2017-07-131-0/+3
| * | | | | | Merge branch 'backport-mr-create-service-changes' into 'master'Grzegorz Bizon2017-07-131-2/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Backport MR create service changes from EEbackport-mr-create-service-changesSean McGivern2017-07-121-2/+1
| * | | | | | Merge branch '34598-more-metrics-info-should-go-to-gitlab-docs' into 'master'Filipa Lacerda2017-07-131-2/+2
| |\ \ \ \ \ \
| | * | | | | | Mor info about prometheus service configuration, and fixing problems with mis...34598-more-metrics-info-should-go-to-gitlab-docsPawel Chojnacki2017-07-071-2/+2
| * | | | | | | Merge branch '34835-environment-truncate-job' into 'master'Filipa Lacerda2017-07-131-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Truncate job on environment view34835-environment-truncate-jobAnnabel Dunstone Gray2017-07-121-2/+2
| * | | | | | | | Merge branch '35036-commit-page-dropdown' into 'master'Phil Hughes2017-07-131-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Fix i18n string in commit page options dropdown35036-commit-page-dropdownBalasankar C2017-07-131-1/+1
| * | | | | | | | Merge branch 'navigation-toggle' into 'master'Phil Hughes2017-07-132-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix wording of nav togglenavigation-toggleAnnabel Dunstone Gray2017-07-122-2/+2
| * | | | | | | | Merge branch '34780-restricted-visibility-levels-in-admin-application-setting...Robert Speicher2017-07-131-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix wrong helper used for adding context for translations.34780-restricted-visibility-levels-in-admin-application-settings-looks-offRuben Davila2017-07-121-2/+2
| * | | | | | | | | Merge branch 'enable-scss-lint-declaration-order' into 'master'Clement Ho2017-07-1211-21/+22
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Enable DeclarationOrder in scss-lintTakuya Noguchi2017-07-1211-21/+22
| * | | | | | | | | | Merge branch 'enable-scss-lint-bang-format' into 'master'Clement Ho2017-07-125-8/+8
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Enable BangFormat in scss-lintTakuya Noguchi2017-07-125-8/+8
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'mr-branch-link-use-tree' into 'master'Robert Speicher2017-07-124-3/+14
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Make commits behind text a link to the target branch commits pageClement Ho2017-07-114-3/+14
| | * | | | | | | | | Convert target branch link to use treeClement Ho2017-07-113-5/+5
| | * | | | | | | | | MR branch link now links to tree instead of commitsClement Ho2017-07-101-1/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'enable-scss-lint-unnecessary-parent-reference' into 'master'Clement Ho2017-07-128-12/+12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Enable UnnecessaryParentReference in scss-lintTakuya Noguchi2017-07-128-12/+12
| * | | | | | | | | | Update vue-resourceFilipa Lacerda2017-07-1220-100/+91
| * | | | | | | | | | Stop sanitizing user 'name' when inserting into dbNathan Neulinger2017-07-121-1/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Updated new navigation image in preferencesPhil Hughes2017-07-121-0/+0
* | | | | | | | | | use `.last` insteadPhil Hughes2017-07-141-1/+1
* | | | | | | | | | restored scss for new_sidebarPhil Hughes2017-07-121-1/+1
* | | | | | | | | | fixed admin breadcrumb titlesPhil Hughes2017-07-123-3/+1
* | | | | | | | | | fixed some inconsistenciesPhil Hughes2017-07-129-0/+9
* | | | | | | | | | moved `@breadcrumb_title` out of the HAML & into a helper methodPhil Hughes2017-07-1224-20/+29
* | | | | | | | | | moved declaration of `breadcrumb_title` into `page_title` methodPhil Hughes2017-07-1228-25/+8
* | | | | | | | | | Merge branch 'master' into new-nav-fix-contextual-breadcrumbsPhil Hughes2017-07-1258-389/+669
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'remove-nprogress-gleaning' into 'master'Clement Ho2017-07-121-6/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove CSS for nprogress removedTakuya Noguchi2017-07-121-6/+0
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'enable-scss-lint-import-path' into 'master'Clement Ho2017-07-122-45/+45
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |