- 17 Dec, 2016 3 commits
-
-
Z.J. van de Weg authored
-
Sean McGivern authored
Cleaner merge commit messages Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23462 See merge request !7722
-
Douglas Barbosa Alexandre authored
Add sorting functionality for group/project members ## What does this MR do? This MR adds sort functionality to group/project members list. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? This MR helps the user to manage and find users of a group/project fast. It also improves UX. ## Screenshots (if relevant) **Before** ![before-pr-member](/uploads/412bfdfddc63e48a62e2095d664660b5/before-pr-member.png) **After** ![pr-after](/uploads/ae23a5c7689b46d26a948f22a0ac2360/pr-after.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21622 Closes #23573 See merge request !7032
-
- 16 Dec, 2016 37 commits
-
-
Stan Hu authored
Avoid use of Hash#dig to keep compatibility with Ruby 2.1 See merge request !8153
-
Douglas Barbosa Alexandre authored
Refactor Bitbucket importer to use BitBucket API Version 2 ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/19946 ## Screenshots (if relevant) This MR needs the following permissions in the Bitbucket OAuth settings: ![image](/uploads/a26ae5e430a724bf581a92da7028ce3c/image.png) - [] ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5995
-
Douglas Barbosa Alexandre authored
-
Nur Rony authored
-
Nur Rony authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Nur Rony authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Annabel Dunstone Gray authored
Resolve "Clean up CSS for project alerts and flash notifications." ## What does this MR do? Cleans up CSS and html for alert stripes at the top of project pages. ## Screenshots #### Before: ![Screen_Shot_2016-12-16_at_2.39.01_PM_copy](/uploads/6a700cf1e41557c00cdaef40f6a2a5b2/Screen_Shot_2016-12-16_at_2.39.01_PM_copy.png) #### After: ![Screen_Shot_2016-12-16_at_2.39.23_PM_copy](/uploads/c849578becc3a634e8b15ab5340d86a2/Screen_Shot_2016-12-16_at_2.39.23_PM_copy.png) ## Are there points in the code the reviewer needs to double check? In order to get multiple alerts to appear manually while testing, I simply added the following block to [app/views/shared/_no_password.html.haml](app/views/shared/_no_password.html.haml): ``` .no-password-message.alert.alert-warning.hidden-xs You won't be able to pull or push project code via #{gitlab_config.protocol.upcase} until you #{link_to 'set a password', edit_profile_password_path} on your account .pull-right = link_to "Don't show again", profile_path(user: {hide_no_password: true}), method: :put | = link_to 'Remind later', '#', class: 'hide-no-password-message' .no-password-message.alert.alert-warning.hidden-xs You won't be able to pull or push project code via #{gitlab_config.protocol.upcase} until you #{link_to 'set a password', edit_profile_password_path} on your account .pull-right = link_to "Don't show again", profile_path(user: {hide_no_password: true}), method: :put | = link_to 'Remind later', '#', class: 'hide-no-password-message' .no-password-message.alert.alert-warning.hidden-xs You won't be able to pull or push project code via #{gitlab_config.protocol.upcase} until you #{link_to 'set a password', edit_profile_password_path} on your account .pull-right = link_to "Don't show again", profile_path(user: {hide_no_password: true}), method: :put | = link_to 'Remind later', '#', class: 'hide-no-password-message' ``` ## Why was this MR needed? More alert-warning stripes are coming via the CI usage limits implementation in EE (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/965), and these layout margins and colors were becoming messy. ## 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 #25743 See merge request !8151
-
Douglas Barbosa Alexandre authored
-
Fatih Acet authored
Make autocomplete request performant ## What does this MR do? Restricts the `autocomplete_sources`action to returning the `json`of one specific `at` type at a time. Makes sure all commands start by immediately showing the `loading` dropdown. If the `loading` dropdown is active, we will request and load in the data for that specific `at` type. We manually trigger the filter again. This time, if `loading` dropdown is not active, initiate default filter behaviour and use the correct data template. Also fixes an issue where `setup` was called multiple times by only setting up and destroying atwho on a focused/blured input. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? `autocomplete_sources` was requested on page load and is large. ## Screenshots (if relevant) 3 requests for 3 different first-time references. ![Screen_Shot_2016-10-14_at_14.43.12](/uploads/0b04eab0d0bf3638d6d6e431036b8089/Screen_Shot_2016-10-14_at_14.43.12.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support 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? Closes #22802 Closes #18435 See merge request !6856
-
Mike Greiling authored
-
Mike Greiling authored
-
Fatih Acet authored
Additional rounded label fixes ## What does this MR do? fixes some UI bugs for the change to rounded labels ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? / Screenshots (if relevant) before: ![image](/uploads/ce359bb021fee324156f050b3f848c2e/image.png) after: ![image](/uploads/a5f0d536db3efdce4ff994deb0d73081/image.png) these now have full rounded border-radius as well :) ![image](/uploads/d331eae2c32dd043766b4148f9ad88e9/image.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) - [ ] 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? - See merge request !8136
-
Clement Ho authored
Put back bootstrap wells I removed bootstrap wells previously but we still need them for now. Will return to this later See merge request !8150
-
Mike Greiling authored
-
Douglas Barbosa Alexandre authored
-
Fatih Acet authored
Prevent enviroment table to overflow when name has underscores ## What does this MR do? Improves columns width Prevents columns content to overflow to other columns ## Screenshots ![Screen_Shot_2016-12-16_at_12.27.14](/uploads/69332e43087bf2bf3a546934700a6b31/Screen_Shot_2016-12-16_at_12.27.14.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 - [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25207 See merge request !8142
-
Douglas Barbosa Alexandre authored
-
Annabel Dunstone Gray authored
-
Kamil Trzciński authored
Pass variables from deployment project services to CI runner ## What does this MR do? This commit introduces the concept of deployment variables - variables that are collected from deployment services and passed to CI runner during a deployment build. Deployment services specify the variables by overriding "predefined_variables" method. This commit also configures variables for KubernetesService ## Why was this MR needed? We need these values for https://gitlab.com/gitlab-org/gitlab-ce/issues/23580 ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - ~~[ ] API support added~~ - Tests - [x] 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? Refers to https://gitlab.com/gitlab-org/gitlab-ce/issues/23580 See merge request !8107
-
Rémy Coutable authored
Resolve "Add a doorkeeper scope suitable for authentication" ## What does this MR do? - Add a single new scope (in addition to the `api` scope we've had) - `read_user` - Allow creating OAuth applications and Personal access tokens with a scope selected - Enforce scopes in the API ## What are the relevant issue numbers? - Closes #20492 - EE counterpart for this MR: gitlab-org/gitlab-ee!946 See merge request !5951
-
Grzegorz Bizon authored
Resolve "Manual actions on pipeline graph" ## What does this MR do? Improves the pipeline graph: - add actions to each node - always show the status icon - improves style - adds new icons to use only on the pipeline graph - fixes tooltip body - adds partial to render the graph node ### Hover state: @dimitrieh This MR does not implements 100% of the mockups - https://gitlab-org.gitlab.io/gitlab-design/progress/dimitrie/pipelines-graphic/22604-spec-previews/#artboard0 As you can see in the mockups, each node has 2 separate hover states, one for the all content and one for the action icon. In order to not hover the all content when we hover the action icon we would need to refactor the all HTML & CSS of all the pipeline graph, lines included. The hover problem can be seen in the following video. [video](https://drive.google.com/file/d/0B2xW80W4hUf0cnJoS1RGQ2hWZlU/view) As you can see in the video, the build node is hovered even when the mouse seems to be far from the element. It does not seem wise to me to change the HTML & CSS now for two reasons: - we would need to rewrite almost everything; - we will probably rewrite everything when we move this to vue. Given the latter point, and considering it will be a bug effort to make the hover states equal to the mockups, I suggest we do that when we rewrite the all view. This is fixable, though, but requires some effort & time. I can, although, be missing something. @annabeldunstone do you see any quick/easy fix here? ## Screenshots (if relevant) [video](https://drive.google.com/file/d/0B2xW80W4hUf0OFhZaXlKTW5mS3c/view?usp=sharing) ![Screen_Shot_2016-12-12_at_12.38.25](/uploads/8f015b0d476c832912e1530208f3d70d/Screen_Shot_2016-12-12_at_12.38.25.png) ![Screen_Shot_2016-12-12_at_12.38.31](/uploads/51de435f1120142d9683f06854d66507/Screen_Shot_2016-12-12_at_12.38.31.png) ![Screen_Shot_2016-12-12_at_12.38.39](/uploads/642e7348bcf46a03d13d8eac1cb7ce6b/Screen_Shot_2016-12-12_at_12.38.39.png) ![Screen_Shot_2016-12-12_at_12.40.00](/uploads/781743893bc14cf05f4b8f258e2b58ba/Screen_Shot_2016-12-12_at_12.40.00.png) Tooltip before ![Screen_Shot_2016-12-06_at_11.29.54](/uploads/b16c0434981a89fb68c4c053c2f1d6e6/Screen_Shot_2016-12-06_at_11.29.54.png) Tooltip after ![Screen_Shot_2016-12-06_at_11.56.03](/uploads/e5e0ede0f3f8a5434e98373ab8a72500/Screen_Shot_2016-12-06_at_11.56.03.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 - [x] 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? Closes #22604 See merge request !7931
-
Rémy Coutable authored
Ensure issuable state changes only fire webhooks once Webhooks were fired twice when issuables were reopened or closed. Once for the status change and once for the `update` operation Closes #25339 See merge request !8101
-
Annabel Dunstone Gray authored
Shorten line length of issues and mrs Limits container width on issue and mr pages. Shortens line length to human readable length. ![Screen_Shot_2016-12-02_at_12.48.08_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/740647c0fd6ea4f0f0aef62155992afe/Screen_Shot_2016-12-05_at_12.54.12_PM.png) Closes #20916 Closes #24408 See merge request !7858
-