summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Remove view details link from MR widget24639-mr-widget-updatesAnnabel Dunstone Gray2016-11-181-3/+0
|
* Merge branch 'optimize-mr-index' into 'master' Yorick Peterse2016-11-181-0/+3
|\ | | | | | | | | More aggressively preload on merge request and issue index pages See merge request !7564
| * More aggressively preload on merge request and issue index pagesDouwe Maan2016-11-181-0/+3
| |
* | Merge branch ↵Robert Speicher2016-11-183-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'jacopo-beschi/gitlab-ce-19981-admin-links-new-group-default-visibility' into 'master' Fix Admin Links to new Group does not respect Default Visibility Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19981 See merge request !7560
| * | Fix Admin Links to new Group does not respect Default Visibilityjacopo-beschi-intersail2016-11-183-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Settings This is done by passing a visibility_level option to the group edit _form. The visibility_level is set to @group.visibility_level in edit ation and to default_group_visibility in the new action.
* | | Merge branch 'pipelines-page-redesign' into 'master' Fatih Acet2016-11-187-49/+104
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipelines page redesign Closes #23637 ![Screen_Shot_2016-11-15_at_1.36.34_PM](/uploads/edc6a58f00cca3e03ffd1689bd6eebd8/Screen_Shot_2016-11-15_at_1.36.34_PM.png) See merge request !7487
| * | | Create global secondary inverted buttonpipelines-page-redesignAnnabel Dunstone Gray2016-11-172-2/+2
| | | |
| * | | Fix pipelines specAnnabel Dunstone Gray2016-11-161-2/+2
| | | |
| * | | Create separate view for pipeline view with tabsAnnabel Dunstone Gray2016-11-156-48/+133
| | | |
| * | | Make pipeline page header responsive; add build counter; add short shaAnnabel Dunstone Gray2016-11-144-79/+67
| | | |
| * | | Remove builds tab from merge requests and commitsAnnabel Dunstone Gray2016-11-143-19/+0
| | | |
| * | | Rearrange and style items on pipeline pageAnnabel Dunstone Gray2016-11-104-58/+52
| | | |
| * | | Move reusable well styles into their own fileAnnabel Dunstone Gray2016-11-101-3/+3
| | | |
| * | | Remove toggle graph JS; put pipeline and builds in separate tabsAnnabel Dunstone Gray2016-11-101-40/+47
| | | |
* | | | Merge branch '24276-usernames-with-dots' into 'master' Douwe Maan2016-11-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow registering users where the username contains dots (.) ## What does this MR do? - Allow registering users whose usernames contains dots `.` - This can currently be done by registering with a username containing no dots, and then editing the username to have dots in the user's profile settings. ## Does this MR meet the acceptance criteria? - [#24276/!7500] Unable to register names with dot - [x] Implementation - [x] Tests - [x] Added - [x] [Passing](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7500/builds) - [x] Meta - [x] CHANGELOG entry created - [x] Documentation created/updated - [x] API support added - [x] Branch has no merge conflicts with `master` - [x] Squashed related commits together - [x] Review - [x] Endboss - [x] Use `Gitlab::Regex::NAMESPACE_REGEX_STR` instead of a hardcoded pattern - [x] Define `NAMESPACE_REGEX_STR` in terms of `NAMESPACE_REGEX_STR_JS` - [ ] Wait for merge ## What are the relevant issue numbers? - Closes #24276 See merge request !7500
| * | | | Allow registering users where the username contains dots (.).Timothy Andrew2016-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Javascript does not support the negative lookbehind assertion (?<!) used in the Ruby regex (to disallow usernames ending in `.git` or `.atom`. Getting the client side code to fully support this format is non-trivial, since we'd either have to heavily complicate the regex used, or modify the frontend code to support more complex validation schemes (it currently uses HTML5 validations). The pragmatic choice is to create a `Gitlab::Regex::NAMESPACE_REGEX_STR_SIMPLE` regex to serve as a Javascript-compatible version of `NAMESPACE_REGEX_STR`. The client-side code will not display an error for usernames ending in `.git` and `.atom`, but these will be caught by the server-side validation.
* | | | | Merge branch '24057-a11y-content-shortcut' into 'master' Annabel Dunstone Gray2016-11-182-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Create a tab shortcut to jump directly to content" ## What does this MR do? Adds accessibility shortcut to page, i.e. if user hits `tab` key right after the page is loaded and user has not interacted to any part of the page, the shortcut appears at top left corner of the page. Then, pressing `enter` (`spacebar` support is WIP) scrolls page to focus on content. ## Are there points in the code the reviewer needs to double check? See if `id` attribute added to `.content` element (present in [_page.html.haml](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/layouts/_page.html.haml)) needs to be reviewed if it is correct approach or we already have an ID that shortcut can refer to. ## Why was this MR needed? This feature is particularly useful for screen readers where user doesn't have to go through entire nav to reach content of page. ## Screenshots (if relevant) ![Screenshot_from_2016-11-17_17-59-22](/uploads/0eb0149f46bd35e9ce629e7a6533be53/Screenshot_from_2016-11-17_17-59-22.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 #24057 See merge request !7533
| * | | | | Add ID for a11y shortcut hrefKushal Pandya2016-11-171-1/+1
| | | | | |
| * | | | | Add shortcut for SRs to `Skip to content` for a11yKushal Pandya2016-11-171-0/+1
| | | | | |
* | | | | | Merge branch 'issue-24512' into 'master' Annabel Dunstone Gray2016-11-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add placeholder in the color input inside the create new label popup ## What does this MR do? Adds the missing placeholder *"Assign custom color #FF0000"* in the label creation popup ( example text for custom hex color). ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? When creating a new label, the example text for custom hex color is missing ## Screenshots (if relevant) Before ![before](/uploads/a3157414d59cea609118a7d711f9b9ee/before.png) After ![Selection_051](/uploads/ca3e2089b40069e4cb6b7aa295b28cfc/Selection_051.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) - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #24512 See merge request !7492
| * | | | | | Add placeholder in the color input inside the create new label popupLuis Alonso Chavez Armendariz2016-11-161-1/+1
| | | | | | |
* | | | | | | Merge branch 'feature/subscribe-to-group-level-labels' into 'master' Sean McGivern2016-11-172-14/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support subscribing to group labels https://gitlab.com/gitlab-org/gitlab-ce/issues/23586 See merge request !7215
| * | | | | | | Avoid code duplication for label subscription status on label partialDouglas Barbosa Alexandre2016-11-171-5/+3
| | | | | | | |
| * | | | | | | Rename LabelSubscription javascript to ProjectLabelSubscriptionDouglas Barbosa Alexandre2016-11-171-1/+1
| | | | | | | |
| * | | | | | | Fix label subscription menu on small screens resolutionDouglas Barbosa Alexandre2016-11-171-2/+12
| | | | | | | |
| * | | | | | | Allow users to subscribe to a group label at group or project levelDouglas Barbosa Alexandre2016-11-171-6/+28
| | | | | | | |
| * | | | | | | Use button instead of an icon to subscribe/unsubscribe to labelsDouglas Barbosa Alexandre2016-11-171-7/+6
| | | | | | | |
| * | | | | | | Remove default value for `project` argument on subscribable concernDouglas Barbosa Alexandre2016-11-171-1/+1
| | | | | | | |
| * | | | | | | Allow users to subscribe to group labels at project-levelDouglas Barbosa Alexandre2016-11-171-6/+6
| | | | | | | |
| * | | | | | | Refactoring label subscription toggle button text to accept a projectDouglas Barbosa Alexandre2016-11-171-2/+2
| | | | | | | |
| * | | | | | | Refactoring label subscription status to accept a projectDouglas Barbosa Alexandre2016-11-171-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'chat-name-authorize' into 'master' Rémy Coutable2016-11-174-0/+76
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to authorize chat user against GitLab. This is needed for: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7438 See merge request !7450
| * | | | | | Add chat_name partialKamil Trzcinski2016-11-172-29/+29
| | | | | | |
| * | | | | | Fix code review style issuesKamil Trzcinski2016-11-171-1/+1
| | | | | | |
| * | | | | | Improve code design after code reviewKamil Trzcinski2016-11-162-8/+10
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into chat-name-authorizeKamil Trzcinski2016-11-1647-277/+319
| |\ \ \ \ \ \
| * | | | | | | Add most of specs for chat namesKamil Trzcinski2016-11-161-4/+10
| | | | | | | |
| * | | | | | | Create relation between chat user and GitLab user and allow to authorize ↵Kamil Trzcinski2016-11-163-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them [ci skip]
* | | | | | | | Merge branch '24010-Add-named-anchors-for-diffs-in-the-commit-page' into ↵Sean McGivern2016-11-174-14/+17
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Adds hash anchors to diff_files to make possible linking exact file in commit Closes #24010 See merge request !7298
| * | | | | | | Unify anchor link format for MR diff files !7298Yar2016-11-154-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path. Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage. Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format. Inspired by #24010 and !7298
* | | | | | | | Merge branch 'related-mr-labels' into 'master' Annabel Dunstone Gray2016-11-161-5/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added colored labels to related MR list. ## What does this MR do? Added colored labels to related MR list. ## Are there points in the code the reviewer needs to double check? Yes, I think haml can be better. ## Why was this MR needed? There was an issue for this #21200 ## Screenshots (if relevant) ![Screen_Shot_2016-11-15_at_21.04.24](/uploads/b601f33f23cdc3318d01279e17deb096/Screen_Shot_2016-11-15_at_21.04.24.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 - [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? Fixes !21200 See merge request !7486
| * | | | | | | | Added colored labels to related MR list.Didem Acet2016-11-161-5/+11
| | | | | | | | |
* | | | | | | | | Merge branch 'issue-boards-counter-border-fix' into 'master' Fatih Acet2016-11-161-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue boards counter border when unauthorized ## What does this MR do? When the user is unauthorized & view issue boards, the border on the counter will not be the whole way around. This fixes that. ## Screenshots (if relevant) ![Screen_Shot_2016-11-16_at_13.03.36](/uploads/54d97f7f4114044aad3bdc78961a31c8/Screen_Shot_2016-11-16_at_13.03.36.png) ## What are the relevant issue numbers? Closes #23664 See merge request !7501
| * | | | | | | | | Fixed issue boards counter border when unauthorizedissue-boards-counter-border-fixPhil Hughes2016-11-161-1/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When unauthorized the border on the counter in issue boards didn't span the whole way around Closes #23664
* | | | | | | | | Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan2016-11-161-2/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defer saving project services to the database if there are no user changes ## What does this MR do? It defers saving project services to the database as long as it is possible. It creates a project service when creating a project only if this project service has an active template. After that project services are saved on the first edit. ## Are there points in the code the reviewer needs to double check? - tests that used `build_missing_services` before the change - number of queries executed ## Why was this MR needed? Motivation in #22281 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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? Fixes #22281 See merge request !6958
| * | | | | | | | Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessaryAdam Niedzielski2016-11-161-2/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '23117-search-for-a-filename-in-a-project' into 'master' Sean McGivern2016-11-161-5/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search for a filename in a project Closes #23117 See merge request !7426
| * | | | | | | Search for a filename in a project23117-search-for-a-filename-in-a-projectValery Sizov2016-11-161-5/+7
| | | | | | | |
* | | | | | | | Merge branch 'fix_navigation_bar_issuables_counters' into 'master' Rémy Coutable2016-11-161-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Navigation bar issuables counters reflects dashboard issuables counters Adds a 2 minute cache on navigation bar issuables counters. The counters on dashboard/issues and dashboard/merge_requests are cached while the navigation bar issuables counters were not. Users read incoherent issuables count throughout the application. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23882 See merge request !7368
| * | | | | | | Navigation bar issuables counters reflects dashboard issuables countersLucas Deschamps2016-11-161-2/+2
| | |_|_|_|/ / | |/| | | | |