- 07 Dec, 2016 1 commit
-
-
Rémy Coutable authored
When the project has invitees, no group members were returned due to a `user_id NOT IN (42, NULL)` query which always returned [] since a `user_id` would be NULL, thus the condition could never match. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
- 05 Dec, 2016 1 commit
-
-
Phil Hughes authored
-
- 02 Dec, 2016 20 commits
-
-
Phil Hughes authored
Fixed controls not showing in groups which fixes tests
-
Phil Hughes authored
Closes #24122
-
Alfredo Sumaran authored
Clean up common_utils.js ## What does this MR do? - Remove unused functions from `common_utils.js`. - Move functions which are used from only one file to that file. ## Why was this MR needed? Because some utils weren't that common (anymore). See merge request !7318
-
Rémy Coutable authored
Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass Closes #25251 See merge request !7893
-
Annabel Dunstone Gray authored
Enable ColorVariable in scss-lint ## What does this MR do? - Enable the ColorVariable rule in`.scss-lint.yml` - Change all color literals in `app/assets/stylesheets` to color variables ## Why was this MR needed? - Enforce the usage of color variables to better constrain the various color values being used ## 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) - 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? Closes #23500 See merge request !7319
-
Annabel Dunstone Gray authored
Fixed row margins on Pipeline Settings page in order to unify styles On the ```project-name/pipelines/settings``` page, I removed the ```.row``` styling on ```.build-status``` and ```.coverage-report``` as it was causing those rows to not have the same margins as the "CI/CD Pipeline" row. Now, they are even as you can see below: ![Screen_Shot_2016-12-01_at_12_54_59_PM](/uploads/a7196ff2e8efcdcd072bc2d26634a42d/Screen_Shot_2016-12-01_at_12_54_59_PM.png) ![Screen_Shot_2016-12-01_at_12_53_18_PM](/uploads/615428bab476fcd1baab86837395d800/Screen_Shot_2016-12-01_at_12_53_18_PM.png) Closes #25098 cc: @filipa See merge request !7881
-
Rémy Coutable authored
Simplify `branch_name` in bin/changelog The `--short` option has existed since at least 1.8.1: https://git-scm.com/docs/git-symbolic-ref/1.8.1 See merge request !7891
-
Valery Sizov authored
-
Rémy Coutable authored
Speed up project snippet security request specs Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7779 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7813 See merge request !7890
-
Robert Speicher authored
Use gitlab-workhorse 1.1.0. Adds Prometheus support and more. See merge request !7868
-
Robert Speicher authored
The `--short` option has existed since at least 1.8.1: https://git-scm.com/docs/git-symbolic-ref/1.8.1
-
Rémy Coutable authored
Update API spec files to describe the correct class by changing `API::API` to the corresponding class, for example `API::AwardEmoji`. Closes #24902 See merge request !7718
-
Robert Speicher authored
Extend code review docs with chapter about the right balance [ci skip] See merge request !7838
-
Grzegorz Bizon authored
[ci skip]
-
Robert Speicher authored
Don't allow to specify a repo or version when installing Workhorse I've also updated the "patch version upgrade" doc since I did forget to update it in !6574. See merge request !7879
-
Douwe Maan authored
Pass commit data to ProcessCommitWorker This changes `ProcessCommitWorker` so that it takes a Hash containing commit data instead of a commit SHA. This means the worker doesn't have to access Git just to process a commit message (and other data it may use). This in turn should solve the problem of ending up with 15 000-something jobs in the `process_commit` queue that take forever to process. See merge request !7744
-
Douwe Maan authored
Allow public access to some Project API endpoints ## What does this MR do? This opens up a few endpoints in the Project API: - `GET /projects/visible` (returns public projects only) - `GET /projects/search/:query` (returns results only for public projects) - `GET /projects/:id` (only if the project is public) - `GET /projects/:id/events` (only if the project is public) - `GET /projects/:id/users` (only if the project is public) ## Are there points in the code the reviewer needs to double check? I've chosen to explicitly add `authenticate!` to GET methods that still need a current user. ## 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) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing Part of #4269 See merge request !7843
-
Sam Rose authored
-
Alfredo Sumaran authored
Replace static fixture for notes_spec ## What does this MR do? Replace `comments.html.haml` and `issue_note.html.haml` used in `notes_spec.js` by dynamically created fixture. ## What are the relevant issue numbers? #24753 See merge request !7683
-
- 01 Dec, 2016 18 commits
-
-
Annabel Dunstone Gray authored
24726 Remove Across GitLab from side navigation ## What does this MR do? Removes Across GitLab header from side navigation ## Screenshots (if relevant) Before: ![Screen_Shot_2016-12-01_at_11.09.12_AM](/uploads/7a8c32a1736a55e0baedf071c21e98db/Screen_Shot_2016-12-01_at_11.09.12_AM.png) After: ![Screen_Shot_2016-12-01_at_11.09.02_AM](/uploads/4d095ec6e4e756abf0301678bb40d59b/Screen_Shot_2016-12-01_at_11.09.02_AM.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 #24726 See merge request !7883
-
winniehell authored
-
tauriedavis authored
-
Fatih Acet authored
Pipelines tabs ## What does this MR do? Changes the URL when the builds tab is clicked making it possible to be shared. 1. Adds a standard way to handle linked tabs: * This behaviour is already present in the merge requests, commit and user `show` page. * This MR introduces a reusable way to accomplish this behaviour for pages with static content. 2. Adds test: * For the linked tabs reusable class * For the pipelines tabs ## Why was this MR needed? To allow having a sharable URL that represented the opened tab ![tabs](/uploads/91e663c12c6e9ac46a17aa3a9489dc72/tabs.gif) ## 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 - [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 #24814 See merge request !7709
-
Fatih Acet authored
Replace static fixture for right_sidebar_spec ## What does this MR do? Replace `right_sidebar.html.haml` for `right_sidebar_spec.js` by already existing dynamically generated fixture. ## What are the relevant issue numbers? #24753 See merge request !7687
-
Fatih Acet authored
Resolve "User-generated permalink IDs collide with GitLab interface" ## What does this MR do? Prevents ID values automatically generated by headers in [GitLab Flavored Markdown](https://github.com/gitlabhq/gitlabhq/blob/master/doc/user/markdown.md#header-ids-and-links) from colliding with IDs used elsewhere in the GitLab interface. This can cause confusion when, for instance, a selector looks for a merge request tab with `id="pipelines"` and there is a header with the same ID earlier in the DOM. How this works: * All header IDs generated with GitLab Flavored Markdown are namespaced with `id="user-content_foo"` * All anchor links which point to these IDs continue to use the non-namespaced hash `<a href="#foo">...</a>` * When a page is loaded or when the `hashchange` event is triggered, javascript will automatically search for `#user-content_foo` if `#foo` cannot be found, and scroll to that position instead. ## Before ![2016-11-21-13.00.28](/uploads/e3be2cd6a9142dfd6e64db5462a6aa76/2016-11-21-13.00.28.gif) ## After: ![2016-11-21-13.12.45](/uploads/f7ae3f3a30c91325eaa3665591b6a850/2016-11-21-13.12.45.gif) ![2016-11-21-13.03.00](/uploads/3a6a782c081ecaa05b8781548d794909/2016-11-21-13.03.00.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 #22781 See also prior attempts to address this issue: #3908, !2023, !2024 See merge request !7631
-
Fatih Acet authored
Remove the help text under the sidebar subscribe button and style it inline ## What does this MR do? Remove the help text under the sidebar subscribe button and style it inline ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Current help text is over obvious and pushes references too far down. Also the subscribe button is now consistently styled and not a complete block button anymore. approved by @awhildy ## Screenshots (if relevant) before: ![image](/uploads/0c9543d2bf184a73b65773caa5f9fc62/image.png) after: ![image](/uploads/765338823376267427f4a16737e39998/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 - [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 #24281 See merge request !7389
-
Annabel Dunstone Gray authored
Resolve "Improper use of bootstrap media query variables" ## What does this MR do? Corrects media queries which are off by `1px` due to incorrect `$screen-{xs,sm,md,lg}-min` usage. ## Are there points in the code the reviewer needs to double check? Ensure none of these errors were somehow intentional (I can't imagine a legitimate use case for `@media (max-width: $screen-sm-min)` though) ## Why was this MR needed? When "min" breakpoints are used for "max-width" media queries, they create an overlap in rule breakpoints. For instance in the following scenario: ```scss .foo { @media (min-width: $screen-sm-min) { width: 100px; padding: 0; } @media (max-width: $screen-sm-min) { padding: 10px 0; } } ``` If the viewport were set to exactly `$screen-sm-min` pixels, both of these media queries would apply. It is important to use `max-width: $screen-xs-max` in this case which is equal to `$screen-sm-min - 1`. ## 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25198 See merge request !7863
-
Alejandro Rodríguez authored
[ci skip]
-
Fatih Acet authored
Resolve "missing design for wiki page" ### To Do: - [x] Move page navigation from sub-menu to sidebar menu - [x] Update wiki page header - [x] Update wiki edit page actions and header - [x] Update `Git access` page design - [ ] ~~Add search to sidebar navigation~~ ### Screen Shots: #### `@media (min-width: $screen-lg)` ![Screen_Shot_2016-11-16_at_12.25.47_PM](/uploads/2efc59639ac53d69808e78a8ba65fcbf/Screen_Shot_2016-11-16_at_12.25.47_PM.png) ![Screen_Shot_2016-11-16_at_12.25.36_PM](/uploads/bb7e93558335edf4216082cc1ac3f8f5/Screen_Shot_2016-11-16_at_12.25.36_PM.png) ![Screen_Shot_2016-11-16_at_12.26.43_PM](/uploads/c2dce7cff05680b9a03438ec7d9967b4/Screen_Shot_2016-11-16_at_12.26.43_PM.png) ![Screen_Shot_2016-11-16_at_12.26.05_PM](/uploads/7dbae25bfc93fb2f01cd231db0cb47d3/Screen_Shot_2016-11-16_at_12.26.05_PM.png) #### `@media (min-width: $screen-md)` ![Screen_Shot_2016-11-16_at_12.28.18_PM](/uploads/4fdcc8c88c38093ea5a4fe0b22b79acf/Screen_Shot_2016-11-16_at_12.28.18_PM.png) ![Screen_Shot_2016-11-16_at_12.28.21_PM](/uploads/ce84a51fdc0623b2b192d8334c2c2f6d/Screen_Shot_2016-11-16_at_12.28.21_PM.png) #### `@media (min-width: $screen-sm)` ![Screen_Shot_2016-11-16_at_12.28.05_PM](/uploads/cf612a36259c248ca597a0850546fe75/Screen_Shot_2016-11-16_at_12.28.05_PM.png) ![Screen_Shot_2016-11-16_at_12.28.08_PM](/uploads/ae4374f9968c1cc064242fde3ad0e214/Screen_Shot_2016-11-16_at_12.28.08_PM.png) ## 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) - 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? Closes #18546 See merge request !7429
-
Rémy Coutable authored
The task will use the canonical repo and the required version. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Sean McGivern authored
Fix GitHub importer to import PR where source repo/fork was renamed/deleted Closes #24594 See merge request !7865
-
Ryan Harris authored
-
Sean McGivern authored
Fix URL rewritting in the Help section Closes #25199 See merge request !7875
-
Alfredo Sumaran authored
Replace static fixture for shortcuts_issuable_spec ## What does this MR do? Replace `issuable.html.haml` for `shortcuts_issuable_spec.js` by already existing dynamically generated fixture. ## What are the relevant issue numbers? #24753 See merge request !7685
-
Stan Hu authored
Make deleting with optimistic locking respect NULL Make deleting with optimistic locking respect NULL For now deleting with optimistic locking is broken when lock_version is still NULL, because Rails would try to delete with `lock_version = 0` while in the database the column is still `NULL`. The monkey patches would force Rails just pass whatever in the column, and stop Rails from casting `NULL` into `0` when the value is read from database. Closes #24766 See merge request !7867
-
Yorick Peterse authored
Resolve "Merge request dashboard page takes over a minute to load" See merge request !7760
-
Stan Hu authored
Gracefully recover from Redis connection failures in Sidekiq initializer Precompiling assets and other Rake tasks would fail if Redis were not available in certain cases. * Closes gitlab-org/gitlab-ce#25143 * Closes gitlab-org/omnibus-gitlab#1743 See merge request !7835
-