summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'remove-orphans' into 'master'34759-rogueJacob Schatz2017-07-062-42/+0
|\
| * Remove orphaned haml filesremove-orphansClement Ho2017-07-062-42/+0
* | Improve & fix the performance bar UI and behaviorRémy Coutable2017-07-0613-28/+215
|/
* Merge branch 'merge-request-commits-table' into 'master'Douwe Maan2017-07-067-76/+83
|\
| * Add table for merge request commitsSean McGivern2017-07-067-76/+83
* | Merge branch '34727-simplified-member-settings' into 'master'Clement Ho2017-07-061-3/+2
|\ \
| * | 34727 Remove two columned layout from project member settingstauriedavis2017-07-061-3/+2
| |/
* | Merge branch '34655-label-field-for-setting-a-chart-s-legend-text-is-not-work...Tim Zallmann2017-07-061-9/+9
|\ \ | |/ |/|
| * Use correct field for label name, fix default for unit to be blankJoshua Lambert2017-07-061-9/+9
* | Merge branch 'repo-limited-width' into 'master'Filipa Lacerda2017-07-061-3/+2
|\ \
| * | Limit the file tree view container widthrepo-limited-widthPhil Hughes2017-07-051-3/+2
* | | Merge branch 'enable-polling-env' into 'master'Kamil Trzciński2017-07-061-0/+2
|\ \ \
| * | | Re-enable polling for environmentsenable-polling-envFilipa Lacerda2017-07-061-0/+2
* | | | Merge branch 'backport_slack_application_changes' into 'master'Sean McGivern2017-07-063-14/+24
|\ \ \ \
| * | | | Backport Service changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_r...backport_slack_application_changesValery Sizov2017-07-053-14/+24
* | | | | Merge branch '34653-minor-ux-cleanups-for-performance-dashboard' into 'master'Tim Zallmann2017-07-065-23/+36
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Cleanup minor UX issues in the performance dashboardJose Ivan Vargas2017-07-065-23/+36
* | | | | Merge branch 'revert-018f7e46' into 'master'Phil Hughes2017-07-061-8/+1
|\ \ \ \ \
| * | | | | Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"revert-018f7e46Kamil Trzciński2017-07-061-8/+1
* | | | | | Merge branch '34716-environment-specific-variables-ce' into 'master'Douwe Maan2017-07-063-14/+25
|\ \ \ \ \ \
| * | | | | | Backports for ee-2112Lin Jen-Shin2017-07-063-14/+25
* | | | | | | Merge branch '33360-generate-kubeconfig' into 'master'Kamil Trzciński2017-07-061-1/+12
|\ \ \ \ \ \ \
| * | | | | | | Rename KUBECONFIG_FILE to KUBECONFIGLin Jen-Shin2017-07-061-1/+1
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 33360-generate-kubeconfigLin Jen-Shin2017-07-06797-8975/+11514
| |\ \ \ \ \ \ \
| * | | | | | | | Changelog entry, doc, and only pass KUBECONFIG_FILELin Jen-Shin2017-06-161-2/+1
| * | | | | | | | Generate KUBECONFIG in KubernetesService#predefined_variablesLin Jen-Shin2017-06-161-1/+13
* | | | | | | | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-064-1/+46
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix build for !11963.Timothy Andrew2017-07-061-1/+1
| * | | | | | | | Implement review comments for !11963 from @filipa.Timothy Andrew2017-07-062-4/+5
| * | | | | | | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-061-1/+1
| * | | | | | | | Get ESLint spec passing for the `OAuthRememberMe` class.Timothy Andrew2017-07-061-6/+6
| * | | | | | | | Move OAuth "remember me" javascript logic into a class.Timothy Andrew2017-07-063-14/+33
| * | | | | | | | Add integration tests around OAuth login.Timothy Andrew2017-07-061-1/+1
| * | | | | | | | Implement "remember me" for OAuth-based login.Timothy Andrew2017-07-062-1/+26
* | | | | | | | | Merge branch 'foreign-keys-for-project-model' into 'master'Sean McGivern2017-07-0639-164/+190
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Rename ActiverecordSerialize copYorick Peterse2017-07-0615-27/+27
| * | | | | | | | Added Cop to blacklist the use of `dependent:`Yorick Peterse2017-07-0626-73/+80
| * | | | | | | | Add many foreign keys to the projects tableYorick Peterse2017-07-063-68/+87
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '34698-fix-stubbing-cached-markdown-fields' into 'master'Rémy Coutable2017-07-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix stubbing attributes alongside cache_markdown_fieldNick Thomas2017-07-051-1/+1
* | | | | | | | Merge branch '33657-user-projects-api' into 'master'Rémy Coutable2017-07-061-1/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Add user projects APIvanadium232017-07-061-1/+8
* | | | | | | | Merge branch 'additional-commits-integer-fix' into 'master'Sean McGivern2017-07-061-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix invalid integer value when more than 1000 commitsadditional-commits-integer-fixPhil Hughes2017-07-051-1/+1
* | | | | | | | Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'Grzegorz Bizon2017-07-066-8/+42
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'a8a4ca17e444c761ed9fc5dca4542cfec79abe55' into 32815--Add-Custo...32815--Add-Custom-CI-Config-PathGrzegorz Bizon2017-07-0526-1028/+968
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-0561-348/+516
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Rename ci_config_file to ci_config_pathLin Jen-Shin2017-07-054-9/+9
| * | | | | | | | | Add back Pipeline#ci_yaml_file_path due to all the troublesLin Jen-Shin2017-07-054-14/+14
| * | | | | | | | | Fix config pathLin Jen-Shin2017-07-042-2/+2
View Lorry Controller Status