summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Added sub-nav to new group sidebargroup-sub-settings-new-sidebarPhil Hughes2017-07-171-1/+16
* Merge branch 'context-nav-avatar-bg' into 'master'Phil Hughes2017-07-171-0/+1
|\
| * Add white background to context header avatarcontext-nav-avatar-bgAnnabel Dunstone Gray2017-07-131-0/+1
* | Merge branch '35069-stop-using-rgba-for-text-color-as-it-leads-to-worse-reada...Annabel Dunstone Gray2017-07-142-9/+9
|\ \
| * | Change text colors from RGBA to HEX35069-stop-using-rgba-for-text-color-as-it-leads-to-worse-readability-on-non-retina-screensPedro Moreira da Silva2017-07-142-9/+9
* | | Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-141-1/+1
|\ \ \
| * | | Update sessions metric name.Ben Kochie2017-07-121-1/+1
* | | | Merge branch 'fix-exact-matches-of-username-and-email-on-top-of-the-user-sear...Sean McGivern2017-07-142-3/+3
|\ \ \ \
| * | | | Fixes the user order being overriden in the autocomplete controllerfix-exact-matches-of-username-and-email-on-top-of-the-user-searchTiago Botelho2017-07-142-3/+3
* | | | | Update Pipeline's badge count in Merge Request and Commits view to match real...Filipa Lacerda2017-07-146-16/+50
* | | | | Merge branch 'fix/gb/recover-from-renaming-project-with-container-images' int...Sean McGivern2017-07-143-17/+41
|\ \ \ \ \
| * | | | | Implement memoization in project correctly this timefix/gb/recover-from-renaming-project-with-container-imagesGrzegorz Bizon2017-07-141-1/+3
| * | | | | Memoize result of checking container images on projectGrzegorz Bizon2017-07-141-1/+1
| * | | | | Add specs for changing default branch in a projectGrzegorz Bizon2017-07-141-1/+1
| * | | | | Recover from renaming project that has container imagesGrzegorz Bizon2017-07-133-15/+37
* | | | | | Refactor user bundleMike Greiling2017-07-147-241/+239
| |/ / / / |/| | | |
* | | | | Merge branch 'fix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes'...Grzegorz Bizon2017-07-141-2/+1
|\ \ \ \ \
| * | | | | Remove trigger_schedule_attributes and factory :ci_trigger_for_trigger_schedulefix/sm/32032-remove-the-rest-of-trigger_schedule-related-codesShinya Maeda2017-07-131-2/+1
* | | | | | Merge branch '19629-remove-inactive-tokens-list' into 'master'Filipa Lacerda2017-07-141-19/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove inactive tokens tablekushalpandya2017-07-141-19/+0
* | | | | | Revert "Merge branch 'revert-2c879643' into 'master'"Sean McGivern2017-07-143-27/+4
* | | | | | Merge branch 'gitlab-git-repository-log' into 'master'Sean McGivern2017-07-142-0/+3
|\ \ \ \ \ \
| * | | | | | More Gitaly annotationsJacob Vosmaer2017-07-132-0/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'bvl-shared-views-for-protected-refs' into 'master'Sean McGivern2017-07-1423-213/+258
|\ \ \ \ \ \
| * | | | | | Use shared protected tag views for CE-partialsbvl-shared-views-for-protected-refsBob Van Landuyt2017-07-1411-103/+122
| * | | | | | Use shared protected branches views for CE-partialsBob Van Landuyt2017-07-1412-110/+136
| | |/ / / / | |/| | | |
* | | | | | 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
|\ \ \ \ \ \ \ \
View Lorry Controller Status