summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-06290-1853/+3336
|\
| * Merge branch 'dm-user-namespace-route-path-validation' into 'master'Sean McGivern2018-02-062-12/+9
| |\
| | * Validate user namespace before saving so that errors persist on modeldm-user-namespace-route-path-validationDouwe Maan2018-02-062-12/+9
| * | Merge branch '42730-close-rugged-repository' into 'master'Douwe Maan2018-02-063-1/+10
| |\ \
| | * | Close low level rugged repository in project cache workerBastian Blank2018-02-063-1/+10
| * | | Merge branch 'zj/gitlab-ce-zj-wiki-page-versions'Douwe Maan2018-02-061-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'master' into 'zj-wiki-page-versions'Douwe Maan2018-02-06447-3398/+5377
| | |\ \
| | * | | Client implementation for WikiPageVerionZeger-Jan van de Weg2018-01-221-2/+2
| * | | | Merge branch 'jej/upload-file-tracks-lfs' into 'master'Sean McGivern2018-02-062-1/+53
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | File upload UI obeys LFS filtersJames Edwards-Jones2018-02-062-1/+53
| * | | | Merge branch 'winh-kubernetes-clusters' into 'master'Phil Hughes2018-02-0629-86/+85
| |\ \ \ \
| | * | | | Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-0629-86/+85
| * | | | | Merge branch '14256-upload-destroy-removes-file' into 'master'Sean McGivern2018-02-062-0/+14
| |\ \ \ \ \
| | * | | | | improvements from feedback14256-upload-destroy-removes-fileMicaël Bergeron2018-02-061-1/+1
| | * | | | | remove file after `Upload#destroy`Micaël Bergeron2018-02-062-0/+14
| * | | | | | Resolve "Add a link to documentation on how to get external ip in the Kuberne...Fabio Busatto2018-02-064-4/+29
| * | | | | | Merge branch 'feature/sm/artifacts-trace' into 'master'Kamil Trzciński2018-02-068-5/+45
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Reorder async/sync tasks in BuildFinishedWorker to read traces efficientlyfeature/sm/artifacts-traceShinya Maeda2018-02-061-2/+5
| | * | | | | Make all workers in BuildFinishedWorker to run async and reorderShinya Maeda2018-02-061-2/+2
| | * | | | | Drop filename enforcementShinya Maeda2018-02-061-6/+0
| | * | | | | GB catches: CreateTraceArtifactService project, user passShinya Maeda2018-02-061-2/+2
| | * | | | | Add essential testsShinya Maeda2018-02-061-1/+7
| | * | | | | Fix inital test failuresShinya Maeda2018-02-061-4/+6
| | * | | | | Add worker queueShinya Maeda2018-02-063-2/+3
| | * | | | | Rename CreateArtifactsTraceService to CreateTraceArtifactServiceShinya Maeda2018-02-065-25/+25
| | * | | | | Add CreateArtifactsTraceWorkerShinya Maeda2018-02-064-5/+28
| | * | | | | Expose current_pathShinya Maeda2018-02-061-3/+5
| | * | | | | JobArtifactUploader#open raise execption if its not FilestorageShinya Maeda2018-02-061-1/+3
| | * | | | | Inlcude the size of trace artifactsShinya Maeda2018-02-061-2/+1
| | * | | | | Trace as artifactsShinya Maeda2018-02-063-1/+9
| | |/ / / /
| * | | | | Merge branch 'fix/show-sidebar-sub-level-items-for-billing' into 'master'Sean McGivern2018-02-062-1/+5
| |\ \ \ \ \
| | * | | | | Override group sidebar linksGeorge Tsiolis2018-02-062-1/+5
| * | | | | | Merge branch '39550-group-labels-redesign' into 'master'Tim Zallmann2018-02-067-34/+91
| |\ \ \ \ \ \
| | * | | | | | Use sprite_icon and variables39550-group-labels-redesignAnnabel Dunstone Gray2018-02-053-3/+4
| | * | | | | | Fix padding & font size on labelsAnnabel Dunstone Gray2018-01-302-3/+4
| | * | | | | | Fix labels specsAnnabel Dunstone Gray2018-01-302-3/+3
| | * | | | | | Add modal for label deletionAnnabel Dunstone Gray2018-01-293-3/+30
| | * | | | | | Change delete notice; update mobile stylesAnnabel Dunstone Gray2018-01-293-17/+31
| | * | | | | | Start redesign of group labels pageAnnabel Dunstone Gray2018-01-293-27/+41
| * | | | | | | Merge branch '26468-fix-admin-recent-sign-in' into 'master'Rémy Coutable2018-02-061-2/+2
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Using correct column for sorting users by Recent Sign-inPoornima2018-02-051-2/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-069-17/+206
| * | | | | | Merge branch '41672-emphasize-gke-cluster-to-new-users' into 'master'Clement Ho2018-02-0511-3/+269
| |\ \ \ \ \ \
| | * | | | | | Restore feature_highlight code41672-emphasize-gke-cluster-to-new-usersEric Eastwood2018-02-0511-3/+269
| * | | | | | | Merge branch 'style/include-branch-in-mobile-view' into 'master'Clement Ho2018-02-052-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Include branch in mobile view for pipelinesGeorge Tsiolis2018-02-042-3/+3
| * | | | | | | | Merge branch '42584-fix-margins-in-tag-list' into 'master'Filipa Lacerda2018-02-051-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixes Different margins between buttons in tag listJacopo2018-02-051-1/+1
| * | | | | | | | | Merge branch '32282-add-foreign-keys-to-todos' into 'master'Yorick Peterse2018-02-053-2/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Set todos#author_id to NOT NULL.32282-add-foreign-keys-to-todosAndreas Brandl2018-02-051-0/+1
View Lorry Controller Status