summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Avoid helper call with default parametersavoid-api-helper-callRobert Schilling2016-11-221-1/+1
|
* Merge branch 'add-node-modules-cache-to-npm-related-builds' into 'master' Robert Speicher2016-11-222-3/+12
|\ | | | | | | | | Add node_modules cache to npm related builds See merge request !7548
| * Add node_modules cache to npm related buildsadd-node-modules-cache-to-npm-related-buildsLuke "Jared" Bennett2016-11-192-3/+12
| |
* | Merge branch '24730-broken-master' into 'master' Robert Speicher2016-11-221-4/+5
|\ \ | | | | | | | | | | | | | | | | | | Fix StrongAttibutes error with Ruby 2.1 Closes #24730 See merge request !7625
| * | Fix StrongAttibutes error with Ruby 2.124730-broken-masterRémy Coutable2016-11-211-4/+5
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'backport-tt' into 'master' Jacob Schatz2016-11-226-0/+609
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport SmartInterval, PrettyTime, SubbableResource from EE. ## What does this MR do? Backports infrastructure used for EE-only Timetracking so it can be used and improved upon in CE. This doesn't really need review... it was already reviewed and merged in EE. There are no side effects or conflicts, just three new classes added: 1. `SubbableResource` -- pubsub for ajax resources 2. `SmartInterval`-- for configurable polling 3. `PrettyTime` -- time parsing and formatting utility methods - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/985 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/870 cc: @jschatz1 See merge request !7573
| * | | Backport SmartInterval, PrettyTime, SubbableResource from EE.backport-ttBryce Johnson2016-11-186-0/+609
| | | |
* | | | Merge branch '18136-ui-for-restricting-global-visibility-levels-is-unclear' ↵Jacob Schatz2016-11-223-8/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Restricted visibility buttons to checkboxes ## What does this MR do? Changes the `Restricted visibility levels` settings to use checkboxes instead of a button group. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-11-14_at_19.25.48](/uploads/0c6ee415ee0c89c0a7e3ffd98f88df71/Screen_Shot_2016-11-14_at_19.25.48.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #18136 See merge request !7463
| * | | | Removed button styling from restricted visibility levels and added ↵18136-ui-for-restricting-global-visibility-levels-is-unclearLuke "Jared" Bennett2016-11-213-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkboxes with icons Review changes
* | | | | Merge branch '20840-getting-started-better-empty-state-for-issues-view' into ↵Jacob Schatz2016-11-2212-47/+98
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Issues empty state ## What does this MR do? Adds the empty state for the project, dashboard and group issues. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ### Filtered to show no issues (on group issues page in this case but also dashboard and projects) ![Screen_Shot_2016-11-08_at_20.55.56](/uploads/b598af4a8a5e2c9fbb859abf36e70e4b/Screen_Shot_2016-11-08_at_20.55.56.png) ### Project with no issues ![Screen_Shot_2016-11-08_at_20.57.08](/uploads/8f54fdf1b3101c46299249fa2944207d/Screen_Shot_2016-11-08_at_20.57.08.png) ![Screen_Shot_2016-11-08_at_20.57.17](/uploads/1d2d162e1d845dd05e945d8ebb1d2101/Screen_Shot_2016-11-08_at_20.57.17.png) ### Group with no projects with any issues ![Screen_Shot_2016-11-08_at_20.54.55](/uploads/f28dc2038839d5bda0eb37f37927d5db/Screen_Shot_2016-11-08_at_20.54.55.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #20840 Closes #20850 See merge request !7309
| * | | | | Added empty state svg and set up blank conditional20840-getting-started-better-empty-state-for-issues-viewLuke "Jared" Bennett2016-11-1812-47/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new spec step Added empty state to dashboard Split empty and filtered empty states Moved empty_state icons into their own folder and DRY up empty state html Fixed failing spec Added to groups page Review changes
* | | | | | Merge branch '23449-cycle-analytics-2-frontend' into 'master' Jacob Schatz2016-11-2228-153/+1198
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cycle analytics second iteration frontend ## Are there points in the code the reviewer needs to double check? Mostly typos and code guidelines. ## Why was this MR needed? This implements the frontend part of !6859 for #23449 ## Screenshots **Initial view** ![Screen_Shot_2016-11-21_at_5.28.43_PM](/uploads/ff9cfa9c9d6c2da28c24e03e384f89af/Screen_Shot_2016-11-21_at_5.28.43_PM.png) **Cycle Analytics with data** ![Screen_Shot_2016-11-21_at_2.09.24_PM](/uploads/18d9786c090bdd554cf786c879543302/Screen_Shot_2016-11-21_at_2.09.24_PM.png) **User doesn't have access for a stage** ![Screen_Shot_2016-11-21_at_2.11.01_PM](/uploads/d1ea76a63f2de2224954b5f40038c488/Screen_Shot_2016-11-21_at_2.11.01_PM.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23449 See merge request !7366
| * | | | | | Use single quote for strings23449-cycle-analytics-2-frontendAlfredo Sumaran2016-11-213-3/+3
| | | | | | |
| * | | | | | Ue svg from SVGs objectAlfredo Sumaran2016-11-211-5/+1
| | | | | | |
| * | | | | | Add custom copy for each empty stageAlfredo Sumaran2016-11-213-7/+13
| | | | | | |
| * | | | | | Highlight nav item on hoverAlfredo Sumaran2016-11-211-0/+6
| | | | | | |
| * | | | | | Scroll CA stage panel on mobileAnnabel Dunstone Gray2016-11-212-46/+54
| | | | | | |
| * | | | | | Fix CSS declarationAlfredo Sumaran2016-11-213-8/+8
| | | | | | |
| * | | | | | administer to administratorAlfredo Sumaran2016-11-211-1/+1
| | | | | | |
| * | | | | | Move SVGs to JS objects for easy reuseAlfredo Sumaran2016-11-217-19/+26
| | | | | | |
| * | | | | | No enough data to Not enough dataAlfredo Sumaran2016-11-211-1/+1
| | | | | | |
| * | | | | | Keep the cookie name as beforeAlfredo Sumaran2016-11-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to avoid prompting the same dialog for people who already dismissed the dialog.
| * | | | | | Fix variable usageAlfredo Sumaran2016-11-211-1/+1
| | | | | | |
| * | | | | | Do not show overview message if there’s already CA dataAlfredo Sumaran2016-11-212-16/+16
| | | | | | |
| * | | | | | Rename Cycle Analytics bundle to .es6Alfredo Sumaran2016-11-211-0/+0
| | | | | | |
| * | | | | | Fix URL to pipelineAlfredo Sumaran2016-11-211-2/+2
| | | | | | |
| * | | | | | Remove unnecesary variableAlfredo Sumaran2016-11-211-85/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be removed until we figure out in what scenario we should display the overview message.
| * | | | | | Set isUserAllowed property with value coming from permissions objectAlfredo Sumaran2016-11-211-4/+3
| | | | | | |
| * | | | | | Add CHANGELOG fileAlfredo Sumaran2016-11-211-0/+4
| | | | | | |
| * | | | | | Adjust width of Cycle Analytics containerAlfredo Sumaran2016-11-211-0/+5
| | | | | | |
| * | | | | | Add view to handle the case when user doesn’t have access to stageAlfredo Sumaran2016-11-217-15/+73
| | | | | | |
| * | | | | | Make linters happyAlfredo Sumaran2016-11-2113-92/+40
| | | | | | |
| * | | | | | Remove unnecesary empty dialogAlfredo Sumaran2016-11-213-10/+0
| | | | | | |
| * | | | | | Add overview view for Cycle AnalyticsAlfredo Sumaran2016-11-215-81/+202
| | | | | | |
| * | | | | | Fix empty stage presentationAlfredo Sumaran2016-11-213-4/+11
| | | | | | |
| * | | | | | Delete StageButton componentAlfredo Sumaran2016-11-213-36/+5
| | | | | | |
| * | | | | | Use correct endpoint for stage eventsAlfredo Sumaran2016-11-211-1/+1
| | | | | | |
| * | | | | | Fix blank spaces on linksAlfredo Sumaran2016-11-217-32/+14
| | | | | | |
| * | | | | | Combine components for better legibilityAlfredo Sumaran2016-11-2112-207/+220
| | | | | | |
| * | | | | | Do not show minutes if days is availableAlfredo Sumaran2016-11-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also show seconds only when seconds is 0
| * | | | | | Fix style for event titlesAlfredo Sumaran2016-11-216-11/+14
| | | | | | |
| * | | | | | Show seconds only if time is only in secondsAlfredo Sumaran2016-11-211-1/+1
| | | | | | |
| * | | | | | Update ItemBuildComponent html structureAlfredo Sumaran2016-11-213-8/+79
| | | | | | |
| * | | | | | Update ItemMergeRequestComponent structureAlfredo Sumaran2016-11-211-4/+24
| | | | | | |
| * | | | | | Show seconds it total time is less than a minuteAlfredo Sumaran2016-11-211-1/+1
| | | | | | |
| * | | | | | Fix variable names to use camelCaseAlfredo Sumaran2016-11-213-14/+21
| | | | | | |
| * | | | | | Fix total_time templateAlfredo Sumaran2016-11-212-19/+10
| | | | | | |
| * | | | | | Use correct data for ItemIssueComponent from responseAlfredo Sumaran2016-11-212-6/+9
| | | | | | |
| * | | | | | Use stage description form endpoint responseAlfredo Sumaran2016-11-2112-23/+35
| | | | | | |
| * | | | | | Adde TotalTimeComponent as global componentAlfredo Sumaran2016-11-213-8/+33
| | | | | | |