- 28 Oct, 2016 4 commits
-
-
blackst0ne authored
Merge branch 'bugfix/dragging_milestones' of gitlab.com:blackst0ne/gitlab-ce into bugfix/dragging_milestones
-
blackst0ne authored
-
blackst0ne authored
-
Sean McGivern authored
Fix couple of GitHub importing bugs Fix a bug in GH comment importing and label applying for imported MRs. See merge request !7139
-
- 27 Oct, 2016 31 commits
-
-
Annabel Dunstone Gray authored
edited stylesheet with mr modal fixes and added to changelog ## What does this MR do? It shortens the modal command merge info elements. ## Are there points in the code the reviewer needs to double check? I used the `.dark` class.. is that correct usage? Made no issue as this is a minor upgrade to UI ## Why was this MR needed? Clipboard buttons could obscure information in the merge info modal, this way its clean. ## Screenshots (if relevant) From: ![image](/uploads/99269c9a314c593cb06239c27565b07c/image.png) To: ![image](/uploads/7e278a5aaa8c57270e8a320cc270b5d8/image.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 - [ ] 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? None, its a quick fix See merge request !7145
-
Sid Sijbrandij authored
Add section about contributing to README Closes #23830 See merge request !7137
-
Dimitrie Hoekstra authored
-
Jacob Schatz authored
Replaced jquery.cookie with js.cookie ## What does this MR do? Fixes currently failing `teaspoon` build by replacing the last reference to `jquery.cookie` with `js.cookie`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? `master` failing. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 [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 !7160
-
Luke Bennett authored
-
Jacob Schatz authored
Enable linting for ES6 files ## What does this MR do? Add `.js.es6` to file extensions checked by ESLint. ## What are the relevant issue numbers? Follows !5445 See merge request !7156
-
winniehell authored
-
Achilleas Pipinellis authored
Document CI pipelines settings See merge request !5847
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Grzegorz Bizon authored
[ci skip]
-
Dmitriy Zaporozhets authored
Revert "Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twitter"."" Looks like I accidently reverted https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7035 although I did not want to . This MR reverts my revert. See merge request !7127
-
Rémy Coutable authored
Documents that users with two-factor authentication enabled may also need to create a personal access token to use git over HTTPS. To address a support issue (gitlab-com/support-forum#980) about why passwords don't work in git when two-factor auth is enabled. gitlab-com/support-forum#980 See merge request !6616
-
Fatih Acet authored
Increase z index on fixed mr tabs Before: <img src="/uploads/e890a4f185af87b66251d744fbe840d5/Screen_Shot_2016-10-26_at_11.58.45_AM.png" width="400px"> After: <img src="/uploads/0bbf72888f6a47bd3027ee7dfff542da/Screen_Shot_2016-10-26_at_11.58.28_AM.png" width="400px"> Closes #23866 See merge request !7124
-
Douwe Maan authored
-
Ahmad Sherif authored
-
Ahmad Sherif authored
-
Fatih Acet authored
Add todo toggle event ## What does this MR do? Adds a custom jQuery event `todo:toggle` to detect when a new todo is added so that the respective todo counters (header navigation and sidebar) can update as needed ## Are there points in the code the reviewer needs to double check? * I wasn't sure whether each `spec` should be modularized based on the html templates or whether they should be separated based on function. There are some crossovers between the `dashboard_spec` and the `header_spec`. * The naming conventions for `sidebar` and `right_sidebar` were a little confusing since they were named the opposite in their `specs`. I made a few assumptions and named a few files based on what I thought they should be named. I'd be happy to change it to something else though
😄 ## Why was this MR needed? This resolves an existing issue where the todo count on the sidebar would not update (until refresh) and refactors the existing methods that are used to update the todo counters (header navigation and sidebar) ## What are the relevant issue numbers? Closes #20140 ## 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5724 -
Adam Niedzielski authored
-
Dmitriy Zaporozhets authored
This reverts commit 9dbd5b3c.
-
Fatih Acet authored
Remove tooltips from build nodes Before: <img src="/uploads/48441dccfe39c5eb1da3dbb9a26e6bd2/Screen_Shot_2016-10-26_at_2.43.46_PM.png" width="400px"> After: <img src="/uploads/d72b2ad4603c964283e155e5a2b053fe/Screen_Shot_2016-10-26_at_2.43.31_PM.png" width="400px"> Closes #23868 See merge request !7128
-
Fatih Acet authored
Create new list dropdown stays open after new list ## What does this MR do? After creating a new list, the dropdown stays open until the user closes the dropdown themselves. ## Screenshots (if relevant) ![keep-open](/uploads/06580dd552647b1a9e5fabc2c978148b/keep-open.gif) ## What are the relevant issue numbers? Closes #22852 See merge request !6742
-
Douwe Maan authored
Backups fail occasionally with "tar: ./objects: file changed as we read it" error - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #5613 See merge request !5814
-
Phil Hughes authored
Closes #22852
-
tiagonbotelho authored
only.
-
Kamil Trzciński authored
Fix encoding issues on pipeline commits ## What does this MR do? #### What does this MR do? Sets `escape: false` on `truncate` method to fix commit message on pipelines page #### Screenshots (if relevant) Before: ![Screen_Shot_2016-10-12_at_8.53.10_AM](/uploads/5e26e98a272139fe2264c315d579178f/Screen_Shot_2016-10-12_at_8.53.10_AM.png) After: ![Screen_Shot_2016-10-12_at_8.52.49_AM](/uploads/58c6c69f2ba735fdcd5a0b6922b56aa7/Screen_Shot_2016-10-12_at_8.52.49_AM.png) #### What are the relevant issue numbers? Closes #23258 See merge request !6832
-
Alfredo Sumaran authored
Removed delete branch tooltip ## What does this MR do? Removed the tooltip on the delete branch button & add `aria-label` ## What are the relevant issue numbers? Closes #23253 See merge request !6954
-
Achilleas Pipinellis authored
Add note about ephemeral statuses in headings See merge request !7131
-
Achilleas Pipinellis authored
[ci skip]
-
- 26 Oct, 2016 5 commits
-
-
Clement Ho authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
Enable PseudoElement in scss-lint ## What does this MR do? Enables `PseudoElement` in `.scss-lint.yml` ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Improve SCSS maintainability and consistency ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - Tests - [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? #23485 See merge request !7083
-
Phil Hughes authored
Closes #23253
-