Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '38869-api' into 'master' | Phil Hughes | 2017-10-10 | 1 | -1/+0 |
|\ | | | | | | | | | Remove Api from main.js See merge request gitlab-org/gitlab-ce!14774 | ||||
| * | Remove Api from main.js38869-api | Filipa Lacerda | 2017-10-09 | 1 | -1/+0 |
| | | |||||
* | | Fix bad type checking to prevent 0 count badge to be shown | Filipa Lacerda | 2017-10-10 | 2 | -8/+25 |
|/ | |||||
* | Removes CommitsList from global namespace | Filipa Lacerda | 2017-10-09 | 2 | -26/+27 |
| | |||||
* | Merge branch 'abuse-reports-module' into 'master' | Filipa Lacerda | 2017-10-09 | 3 | -6/+3 |
|\ | | | | | | | | | Convert AbuseReports class to a module See merge request gitlab-org/gitlab-ce!14709 | ||||
| * | Convert AbuseReports class to a moduleabuse-reports-module | Phil Hughes | 2017-10-06 | 3 | -6/+3 |
| | | |||||
* | | Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespace | Filipa Lacerda | 2017-10-09 | 6 | -34/+29 |
| | | |||||
* | | Move cycle analytics banner into a vue file | Filipa Lacerda | 2017-10-09 | 2 | -0/+57 |
| | | |||||
* | | Merge branch 'cleanup_old_nav_stuff' into 'master' | Filipa Lacerda | 2017-10-07 | 1 | -15/+0 |
|\ \ | | | | | | | | | | | | | Remove old navigation CSS See merge request gitlab-org/gitlab-ce!14573 | ||||
| * | | Start moving new nav styles into header.scss | Annabel Dunstone Gray | 2017-10-06 | 1 | -15/+0 |
| | | | |||||
* | | | Commenting on image diffs | Felipe Artur | 2017-10-07 | 21 | -51/+690 |
| | | | |||||
* | | | Merge branch 'fl-38869-linked-tabs' into 'master' | Mike Greiling | 2017-10-06 | 1 | -3/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | Removes unnecessary load of LinkedTabs, Pipelines and MiniPipelineGraph classes See merge request gitlab-org/gitlab-ce!14734 | ||||
| * \ \ | Merge branch 'master' into fl-38869-linked-tabsfl-38869-linked-tabs | Filipa Lacerda | 2017-10-06 | 24 | -90/+618 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ... | ||||
| * | | | Removes unnecessary load of LinkedTabs, Pipelines and MiniPipelineGraph classes | Filipa Lacerda | 2017-10-06 | 1 | -3/+0 |
| | | | | |||||
* | | | | Merge branch ↵ | Fatih Acet | 2017-10-06 | 2 | -1/+9 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36255-metrics-that-do-not-have-a-complete-history-are-not-shown-at-all' into 'master' Resolve "Metrics that do not have a complete history are not shown at all" Closes #36255 See merge request gitlab-org/gitlab-ce!14741 | ||||
| * | | | | allow legend to properly handle NaN values | Mike Greiling | 2017-10-06 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | allow prometheus graphs to handle non-congiuous paths (with NaN, +Inf, and -Inf) | Mike Greiling | 2017-10-06 | 1 | -0/+4 |
| | |/ / | |/| | | |||||
* | | | | Show confirmation modal before deleting account | Winnie Hellmann | 2017-10-06 | 5 | -4/+175 |
|/ / / | |||||
* | | | Merge branch 'ide-fix-back-btn' into 'master' | Fatih Acet | 2017-10-06 | 6 | -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-btn | Tim Zallmann | 2017-10-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Resetting of active Line + setting it for the async display functions | Tim Zallmann | 2017-10-06 | 3 | -13/+22 |
| | | | | |||||
| * | | | Fixed Linting Error + Error with Line Highlighter found in Test | Tim Zallmann | 2017-10-05 | 2 | -3/+3 |
| | | | | |||||
| * | | | CHanged to Helper Method | Tim Zallmann | 2017-10-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Removed the console.log | Tim Zallmann | 2017-10-05 | 1 | -1/+0 |
| | | | | |||||
| * | | | Refactored Highlighting mechanism | Tim Zallmann | 2017-10-05 | 4 | -16/+18 |
| | | | | |||||
| * | | | Optimising If | Tim Zallmann | 2017-10-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | Added Check for Line Number Element | Tim Zallmann | 2017-10-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed Repo Sidebar Tests | Tim Zallmann | 2017-10-04 | 1 | -29/+30 |
| | | | | |||||
| * | | | Fixed Eslint Errors | Tim Zallmann | 2017-10-04 | 1 | -4/+4 |
| | | | | |||||
| * | | | Polished Back Button for files that are not in the tree anymore | Tim Zallmann | 2017-10-04 | 1 | -1/+10 |
| | | | | |||||
| * | | | Fixed Back Button for files + line number jumping for preview and editor | Tim Zallmann | 2017-10-04 | 4 | -7/+30 |
| | | | | |||||
* | | | | Merge branch ↵ | Kamil Trzciński | 2017-10-06 | 2 | -0/+117 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 Maeda | 2017-10-07 | 5 | -9/+19 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * | | | | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-06 | 6 | -19/+92 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-10-05 | 10 | -53/+91 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * \ \ \ \ \ | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-05 | 36 | -136/+693 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * | | | | | | | Changes after review | Filipa Lacerda | 2017-10-04 | 1 | -3/+4 |
| | | | | | | | | |||||
| * | | | | | | | Adds Frontend specs | Filipa Lacerda | 2017-10-04 | 1 | -10/+3 |
| | | | | | | | | |||||
| * | | | | | | | Adjustments to polling & forms | Filipa Lacerda | 2017-10-04 | 1 | -44/+28 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-04 | 2 | -10/+11 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-04 | 11 | -59/+144 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-04 | 60 | -764/+765 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * | | | | | | | | | | Adjust to route change | Filipa Lacerda | 2017-10-03 | 2 | -26/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust toggle status Add confirmation box Adds permissions checks | ||||
| * | | | | | | | | | | Adds toggle button | Filipa Lacerda | 2017-10-02 | 2 | -0/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds polling function | ||||
| * | | | | | | | | | | Updates sidebar | Filipa Lacerda | 2017-10-02 | 1 | -11/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Starts edit form | Filipa Lacerda | 2017-10-02 | 1 | -0/+11 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '18608-lock-issues-v2' into 'master' | Sean McGivern | 2017-10-06 | 16 | -71/+439 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531 | ||||
| * | | | | | | | | | | UX review18608-lock-issues-v2 | Luke "Jared" Bennett | 2017-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix wording in the js messages | Jarka Kadlecova | 2017-10-06 | 2 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch '18608-lock-issues-v2' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Luke "Jared" Bennett | 2017-10-03 | 57 | -704/+715 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 |