summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-newShinya Maeda2017-11-07154-1018/+1456
|\
| * Resolve "Fix GKE wording"Fabio Busatto2017-11-072-2/+2
| * Merge branch '39791-when-reopening-an-issue-the-mattermost-notification-has-n...Rémy Coutable2017-11-071-1/+1
| |\
| | * Fix issue reopen Mattermost / Slack message39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issueSean McGivern2017-11-061-1/+1
| * | Merge branch '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1...Douwe Maan2017-11-071-3/+3
| |\ \
| | * | Cache the root ref SHA in an instance variable in Repository#merged_to_root_ref?Rémy Coutable2017-11-061-3/+3
| * | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable2017-11-076-1/+24
| |\ \ \
| | * | | Support custom attributes on groupsMarkus Koller2017-11-063-1/+14
| | * | | Support custom attributes on projectsMarkus Koller2017-11-063-0/+10
| * | | | Merge branch '35616-move-gke-form-1st-iteration' into 'master'Grzegorz Bizon2017-11-073-8/+32
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into 35616-move-gke-form-1st-ite...Kamil Trzcinski2017-11-0693-548/+563
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-cluster...move-kubernetes-from-service-to-clusters-page-10-2-verShinya Maeda2017-11-068-57/+18
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-cluster...Shinya Maeda2017-11-0551-694/+852
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '35616-move-gke-form-1st-iteration' into move-kubernetes-from-se...Shinya Maeda2017-11-043-8/+32
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix page titleFilipa Lacerda2017-11-031-1/+1
| | | * | | | | | | Adds check for existing clusterFilipa Lacerda2017-11-031-5/+12
| | | * | | | | | | Fix pipeline. Fix routing when validation failed.Shinya Maeda2017-11-012-2/+2
| | | * | | | | | | Fix paths to the first pageKamil Trzcinski2017-11-013-14/+10
| | | * | | | | | | Adds buttons to the first page.Filipa Lacerda2017-10-273-3/+24
| * | | | | | | | | Merge branch '2518-saved-configuration-for-issue-board' into 'master'Sean McGivern2017-11-0714-76/+163
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | appease lint2518-saved-configuration-for-issue-boardSimon Knox2017-11-071-3/+1
| | * | | | | | | | | unused propSimon Knox2017-11-061-7/+1
| | * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 2518-saved-conf...Simon Knox2017-11-06132-1324/+1600
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | * | | | | | | | | fix bad master mergeSimon Knox2017-11-021-4/+4
| | * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 2518-saved-conf...Simon Knox2017-11-0198-1987/+2312
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | resolve conflictsSimon Knox2017-10-311-42/+17
| | * | | | | | | | | | match UX guide for submit/cancel buttonsSimon Knox2017-10-311-2/+2
| | * | | | | | | | | | apply changes for JS and CSS from gitlab-ee!2912Simon Knox2017-10-3115-65/+183
| | * | | | | | | | | | Remove unnecessary helper methodOswaldo Ferreira2017-10-311-6/+0
| | * | | | | | | | | | Initial CE backport for saved issue boardOswaldo Ferreira2017-10-311-6/+1
| * | | | | | | | | | | Merge branch 'feature_change_sort_refs' into 'master'Douwe Maan2017-11-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Change tags order in refs dropdownfeature_change_sort_refsVitaliy @blackst0ne Klachkov2017-11-071-1/+1
| * | | | | | | | | | | | Merge branch 'multiple-query-prometheus-graphs' into 'master'Tim Zallmann2017-11-075-32/+70
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | make legend X-offset into a constantmultiple-query-prometheus-graphsMike Greiling2017-11-062-6/+8
| | * | | | | | | | | | | | fix eslint max-lineMike Greiling2017-11-061-1/+2
| | * | | | | | | | | | | | correctly set the domain of a result set when it is different on other tracksMike Greiling2017-11-062-11/+11
| | * | | | | | | | | | | | simplify legend label for additonal tracksMike Greiling2017-11-061-1/+1
| | * | | | | | | | | | | | fix karma failuresMike Greiling2017-11-061-1/+1
| | * | | | | | | | | | | | add dashed and dotted line styles for multiple-query graphsMike Greiling2017-11-064-10/+31
| | * | | | | | | | | | | | add track information to data legendMike Greiling2017-11-061-3/+7
| | * | | | | | | | | | | | process all queries within a graphMike Greiling2017-11-061-16/+24
| | * | | | | | | | | | | | pass all graph queries into createTimeSeriesMike Greiling2017-11-062-2/+3
| | * | | | | | | | | | | | fix bug in which axes are scaled only to first data setMike Greiling2017-11-061-2/+3
| * | | | | | | | | | | | | fix borderzero lintmaster-lintSimon Knox2017-11-071-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'es-module-copy_as_gfm' into 'master'Filipa Lacerda2017-11-064-9/+17
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | fix broken reference to transformGFMSelectiones-module-copy_as_gfmMike Greiling2017-11-011-2/+3
| | * | | | | | | | | | | | remove global export except in test environmentsMike Greiling2017-11-012-5/+11
| | * | | | | | | | | | | | move to copy_as_gfm to behaviors since it is invoked on every pageMike Greiling2017-11-013-3/+4
| * | | | | | | | | | | | | Merge branch '34768-fix-issuable-header-wrapping' into 'master'Annabel Dunstone Gray2017-11-064-8/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | 34768 Fix problem with issuable header wrapping when content is too long34768-fix-issuable-header-wrappingtauriedavis2017-11-034-8/+27