summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '43496-error-message-for-gke-clusters-persists-in-the-next-page'...bjk/kube_state_metricsKamil Trzciński2018-02-231-2/+2
|\
| * Do not persist Google Project Billing Failure errors after a reloadMatija Čupić2018-02-221-2/+2
* | Resolve "Milestone Quick Action not displayed with no project milestones but ...🙈 jacopo beschi 🙉2018-02-232-29/+27
* | Merge branch 'users-autocomplete' into 'master'Douwe Maan2018-02-234-12/+17
|\ \
| * | Added changelog for user search improvementsusers-autocompleteYorick Peterse2018-02-221-1/+1
| * | Optimise searching for users using short queriesYorick Peterse2018-02-221-2/+2
| * | Removed pagination from AutocompleteUsersFinderYorick Peterse2018-02-223-7/+8
| * | Don't pluck IDs in AutocompleteUsersFinderYorick Peterse2018-02-221-3/+7
| |/
* | Merge branch '43261-fix-import-from-url-name-collision-active-tab' into 'master'Phil Hughes2018-02-232-8/+9
|\ \
| * | Make import tab/form active when importing project by URL and validation fails43261-fix-import-from-url-name-collision-active-tabEric Eastwood2018-02-202-8/+9
* | | Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-2357-248/+698
|\ \ \
| * | | Port `read_cross_project` ability from EEBob Van Landuyt2018-02-2257-248/+698
* | | | Add Tip about Push to Create project on New Project pageAndré Luís2018-02-238-8/+82
* | | | Merge branch '41619-turn-on-legacy-authorization-for-new-clusters-on-gke' int...Kamil Trzciński2018-02-221-2/+2
|\ \ \ \
| * | | | Modify cluster creation API method to enable legacy_apac as defaultMayra Cabrera2018-02-221-2/+2
| | |_|/ | |/| |
* | | | Merge branch '42431-add-auto-devops-and-clusters-button-to-projects' into 'ma...Rémy Coutable2018-02-2220-247/+434
|\ \ \ \
| * | | | Unify use of can_current_user_push_code Presenter42431-add-auto-devops-and-clusters-button-to-projectsOswaldo Ferreira2018-02-222-2/+2
| * | | | Use select instead rejectOswaldo Ferreira2018-02-221-2/+2
| * | | | Move can_current_user_push_to_branch to PresenterOswaldo Ferreira2018-02-223-8/+10
| * | | | Simplify project check with duck typingOswaldo Ferreira2018-02-221-1/+1
| * | | | Move project presenter instance creation to controllerOswaldo Ferreira2018-02-223-2/+2
| * | | | Update enabled Kubernetes cluster button to "Kubernetes configured"Eric Eastwood2018-02-221-1/+1
| * | | | Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projectsEric Eastwood2018-02-22366-1731/+1670
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Remove indent and reduce bloat with link_to_ifEric Eastwood2018-02-221-10/+6
| * | | | Fix enabled filtering on stat anchorsEric Eastwood2018-02-211-4/+4
| * | | | Link "add a Kubernetes cluster" to new cluster pageEric Eastwood2018-02-211-1/+1
| * | | | Use method call instead hash accessesOswaldo Ferreira2018-02-211-4/+4
| * | | | Memoize method which is called multiple times on presenterOswaldo Ferreira2018-02-201-4/+7
| * | | | Add unit tests to presenter methodsOswaldo Ferreira2018-02-201-33/+41
| * | | | Use OpenStruct instead Hash for statistics buttonsOswaldo Ferreira2018-02-202-100/+62
| * | | | Improve methods namingOswaldo Ferreira2018-02-203-9/+9
| * | | | Move default_project_view tests to presenterOswaldo Ferreira2018-02-202-3/+3
| * | | | Move button list logic to project presenterOswaldo Ferreira2018-02-2012-349/+379
| * | | | Switch back to using a single partialEric Eastwood2018-02-202-8/+8
| * | | | Add Auto DevOps and Kubernetes cluster button to project pageEric Eastwood2018-02-1611-116/+302
* | | | | Merge branch 'ui-bundle-tag-remove' into 'master'Clement Ho2018-02-221-2/+0
|\ \ \ \ \
| * | | | | Remove bundle tag for ui helpJacob Schatz2018-02-221-2/+0
* | | | | | Merge branch '43373-fix-cache-index-appending' into 'master'Kamil Trzciński2018-02-221-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Change cache index delimiter to character not recognizable as variable partTomasz Maczukin2018-02-211-1/+1
* | | | | | Use dynamic imports in dispatcher (Part 3)Clement Ho2018-02-2222-131/+32
| |/ / / / |/| | | |
* | | | | Merge branch 'fix-500-for-invalid-upload-path' into 'master'Sean McGivern2018-02-223-1/+14
|\ \ \ \ \
| * | | | | Fix 500 error when loading an invalid upload URLSean McGivern2018-02-223-1/+14
* | | | | | Merge branch 'revert-3487441b' into 'master'Sean McGivern2018-02-221-4/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Revert "Merge branch 'tc-info-version-check' into 'master'"revert-3487441bVictor Wu2018-02-211-4/+1
* | | | | | Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-jsRémy Coutable2018-02-2222-44/+58
* | | | | | Fix the groupLabelsPath in app/assets/javascripts/api.jsRémy Coutable2018-02-221-1/+1
* | | | | | Merge branch '42886-followup-to-new-design-for-cancel-stop-pipeline-confirmat...Filipa Lacerda2018-02-225-148/+93
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 42886-followup-to-new-design-for-cancel-stop-pipel...42886-followup-to-new-design-for-cancel-stop-pipeline-confirmationShah El-Rahman2018-02-21249-1108/+936
| |\ \ \ \ \ \
| * | | | | | | Remove use of callback in pipeline stop/retry modalsShah El-Rahman2018-02-165-148/+93
* | | | | | | | Merge branch '43134-reduce-queries-pipelines-controller-show' into 'master'Grzegorz Bizon2018-02-221-1/+1
|\ \ \ \ \ \ \ \
View Lorry Controller Status