summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fl-38869-linked-tabsfl-38869-linked-tabsFilipa Lacerda2017-10-0634-108/+700
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (136 commits) Ensure we set SUITE_FLAKY_RSPEC_REPORT_PATH to nil in RspecFlaky::Listener spec Gitaly feature flag metadata Add delete issue docs Adjust tooltips to adhere to 8px grid and make them more readable Fix JS lock issue specs Improve redirect uri state and fix all remaining tests Add 1000+ counters (instead of inifnite) to jobs controller Use short path project_clusters_url Change Clusters to Cluster in sidebar Security fix: redirection in google_api/authorizations_controller UX review Fix sidebar title Fix fixture Fix margins in edit form Use utc for time comparision Good old dangling comma Fix wording in the js messages Resetting of active Line + setting it for the async display functions Add some empty spaces Fix failing spec Refactor discussion lock docs ...
| * Merge branch 'ide-fix-back-btn' into 'master'Fatih Acet2017-10-066-19/+62
| |\ | | | | | | | | | | | | Repo Editor : Fixes Back Button for files + line number jumping for preview and editor See merge request gitlab-org/gitlab-ce!14508
| | * Good old dangling commaide-fix-back-btnTim Zallmann2017-10-061-1/+1
| | |
| | * Resetting of active Line + setting it for the async display functionsTim Zallmann2017-10-063-13/+22
| | |
| | * Fixed Linting Error + Error with Line Highlighter found in TestTim Zallmann2017-10-052-3/+3
| | |
| | * CHanged to Helper MethodTim Zallmann2017-10-051-1/+1
| | |
| | * Removed the console.logTim Zallmann2017-10-051-1/+0
| | |
| | * Refactored Highlighting mechanismTim Zallmann2017-10-054-16/+18
| | |
| | * Optimising IfTim Zallmann2017-10-041-2/+2
| | |
| | * Added Check for Line Number ElementTim Zallmann2017-10-041-1/+1
| | |
| | * Fixed Repo Sidebar TestsTim Zallmann2017-10-041-29/+30
| | |
| | * Fixed Eslint ErrorsTim Zallmann2017-10-041-4/+4
| | |
| | * Polished Back Button for files that are not in the tree anymoreTim Zallmann2017-10-041-1/+10
| | |
| | * Fixed Back Button for files + line number jumping for preview and editorTim Zallmann2017-10-044-7/+30
| | |
| * | Merge branch ↵Kamil Trzciński2017-10-064-0/+126
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master' Create Kubernetes cluster on GKE from k8s service Closes #35954 See merge request gitlab-org/gitlab-ce!14470
| | * \ Merge branch 'master' into ↵Shinya Maeda2017-10-077-11/+36
| | |\ \ | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| | * \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-067-19/+100
| | |\ \ \ | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| | * | | | Fix margins in edit formFilipa Lacerda2017-10-061-0/+4
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-10-0512-58/+99
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| | * \ \ \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-0544-299/+808
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| | * | | | | | Changes after reviewFilipa Lacerda2017-10-041-3/+4
| | | | | | | |
| | * | | | | | Adds Frontend specsFilipa Lacerda2017-10-041-10/+3
| | | | | | | |
| | * | | | | | Adjustments to polling & formsFilipa Lacerda2017-10-041-44/+28
| | | | | | | |
| | * | | | | | Merge branch 'master' into ↵Shinya Maeda2017-10-046-12/+18
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| | * \ \ \ \ \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-0414-59/+167
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| | * \ \ \ \ \ \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-0489-4347/+1005
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| | * | | | | | | | | Adjust to route changeFilipa Lacerda2017-10-032-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust toggle status Add confirmation box Adds permissions checks
| | * | | | | | | | | Adds new line for cssFilipa Lacerda2017-10-031-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Adds toggle buttonFilipa Lacerda2017-10-022-0/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds polling function
| | * | | | | | | | | Updates sidebarFilipa Lacerda2017-10-021-11/+0
| | | | | | | | | | |
| | * | | | | | | | | Starts edit formFilipa Lacerda2017-10-022-0/+16
| | | | | | | | | | |
| | * | | | | | | | | Adds login page, sidebar, header and formFilipa Lacerda2017-09-291-0/+0
| | | | | | | | | | |
| * | | | | | | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-0621-88/+498
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531
| | * | | | | | | | | | UX review18608-lock-issues-v2Luke "Jared" Bennett2017-10-064-1/+10
| | | | | | | | | | | |
| | * | | | | | | | | | Fix wording in the js messagesJarka Kadlecova2017-10-062-2/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch '18608-lock-issues-v2' of gitlab.com:gitlab-org/gitlab-ce into ↵Luke "Jared" Bennett2017-10-0386-4285/+953
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Jarka Kadlecova2017-10-0386-4285/+953
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 # Conflicts: # db/schema.rb
| | * | | | | | | | | | | Remove interpolated translation stringsLuke "Jared" Bennett2017-10-032-7/+8
| | |/ / / / / / / / / /
| | * | | | | | | | | | Further review changesLuke "Jared" Bennett2017-10-023-11/+10
| | | | | | | | | | | |
| | * | | | | | | | | | FE review changes app codeLuke "Jared" Bennett2017-10-018-24/+40
| | | | | | | | | | | |
| | * | | | | | | | | | Fix md-area top border-radius with issue issuable-note-warningLuke "Jared" Bennett2017-09-291-1/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Correct disabled note form style18608-lock-issuesLuke "Jared" Bennett2017-09-272-2/+23
| | | | | | | | | | | |
| | * | | | | | | | | | Fix karmaLuke "Jared" Bennett2017-09-271-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Fix static analysisLuke "Jared" Bennett2017-09-271-2/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Disable comment form when discussion locked for userJarka Kadlecova2017-09-262-0/+19
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issuesJarka Kadlecova2017-09-2581-741/+4225
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/notes/components/issue_comment_form.vue
| | * | | | | | | | | | | Fix diff commenting on commitsLuke "Jared" Bennett2017-09-201-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-2029-335/+145
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | is-active review changesLuke "Jared" Bennett2017-09-203-12/+9
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-1816-83/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status