- 08 Dec, 2016 10 commits
-
-
Filipa Lacerda authored
Update changelog with MR ID
-
Sean McGivern authored
Remove unnecessary target branch link from MR page in case of deleted target branch Fixes #24507 See merge request !7916
-
Sean McGivern authored
Shows group members in the project members list Closes #24122 See merge request !7899
-
Rémy Coutable authored
Update factory_girl_rails to 4.7.0 Changes: https://github.com/thoughtbot/factory_girl/blob/master/NEWS See merge request !7986
-
Annabel Dunstone Gray authored
Enable display of admonition icons in Asciidoc. ## What does this MR do? Enables admonition icons to display in rendered asciidoc documents. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Gitlab support of asciidoc needs a lot of improvements to make it useful in enterprise settings. ## Screenshots (if relevant) ![Screenshot_20161129_132250](/uploads/d280336000eb8b445d07d9bb2a2ed639/Screenshot_20161129_132250.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? See merge request !7812
-
Rémy Coutable authored
Correct previous stable branch used in 8.14 to 8.15 update guide [ci skip] See merge request !7984
-
Robert Speicher authored
-
Douwe Maan authored
Allow public access to some Tag API endpoints Continuation of #4269. See merge request !7896
-
Douwe Maan authored
Reenables /user API request to return private-token if user is admin and requested with sudo ## What does this MR do? Reenables the API /users to return `private-token` when sudo is either a parameter or passed as a header and the user is admin. ## Screenshots (if relevant) Without **sudo**: ![Screen_Shot_2016-11-21_at_11.44.49](/uploads/ebecf95dbadaf4a159b80c61c75771d9/Screen_Shot_2016-11-21_at_11.44.49.png) With **sudo**: ![Screen_Shot_2016-11-21_at_11.45.52](/uploads/f25f9ddffcf2b921e9694e5a250191d3/Screen_Shot_2016-11-21_at_11.45.52.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) - [x] 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 #24537 See merge request !7615
-
Robert Speicher authored
[ci skip]
-
- 07 Dec, 2016 26 commits
-
-
Horacio Sanson authored
When rendering Asciidoc documents this merge request enables the diplay of admonition blocks using font icons. This improves the looks of Asciidoc redered files. This uses the font-awesome fonts already present in Gitlab so no large dependencies are required for this to work.
-
Rydkin Maxim authored
add link_to_if helper on target_branch link on Merge Request show page for case of deleted target branch add spec on #24507 bug description add changelog entry fix changelog remove unnecessary js:true from specs change spec title add test for link to target branch before deletions renamed spec about state of target branch link before and after deletion some fixes into spec
-
Yorick Peterse authored
Update outdated visible content spec descriptions This fixes some spec descriptions that were not fixed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7947. See merge request !7971
-
Rémy Coutable authored
Fix Backup::Manager#remove_old Closes #25399 See merge request !7972
-
Rémy Coutable authored
Fix typos in API doc examples ## What does this MR do? Fixes a typo in the API docs. The `curl` examples in [build_triggers.md](doc/api/build_triggers.md) and [build_variables.md](doc/api/build_variables.md) all have a typo in the auth header. They all say `PRIVATE_TOKEN` when it should be `PRIVATE-TOKEN`. ## What are the relevant issue numbers? Fixes #24565 See merge request !7514
-
Kamil Trzciński authored
Run builds with runners with tags gitlab-org and 2gb ## What does this MR do? Added `gitlab-org` and `2gb` tags for jobs in `.gitlab-ci.yml`. So builds will be picked up by `gitlab-shared-runners-manager-X.gitlab.com runners` ## Are there points in the code the reviewer needs to double check? Only `.gitlab-ci.yml` ## Why was this MR needed? https://gitlab.com/gitlab-com/infrastructure/issues/714 ## Screenshots (if relevant) ## 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? https://gitlab.com/gitlab-com/infrastructure/issues/714 See merge request !7757
-
Rémy Coutable authored
Grapify the issues API Related to #22928 See merge request !7968
-
Sean Packham authored
Update GLU index for new report, broken links + typos ## What does this MR do? Update text on GLU documentation for spelling and new State of DevOps book. /cc @axil See merge request !7962
-
tiagonbotelho authored
-
tiagonbotelho authored
-
Marin Jankovski authored
Bump Git version requirement to 2.8.4 Following gitlab-org/omnibus-gitlab!1108, the install doc and README should be updated too. See merge request !7878
-
Yorick Peterse authored
Bump gitlab-shell version to 4.0.3 See merge request !7953
-
Sean McGivern authored
-
Rémy Coutable authored
Move admin hooks spinach to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7942
-
Rémy Coutable authored
Move admin logs spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7945
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Achilleas Pipinellis authored
UX Guide - add initial animation guidance Adding guidance to our UX Guide around animation. This is to help us implement #24831 and add polished, consistent animation throughout GitLab. See merge request !7780
-
Rémy Coutable authored
Use :maximum instead of :within for length validators with a 0..N range Closes #25209 See merge request !7894
-
Yorick Peterse authored
-
Achilleas Pipinellis authored
Update php.md - /.dockerinit was removed in v1.11 so the test always results in … See merge request !7882
-
Rémy Coutable authored
Add excoveralls in list of coverage examples See merge request !7906
-
Sean McGivern authored
Update custom_hooks.md for chained hooks support See merge request !6721
-
Robert Schilling authored
-
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>
-
Rémy Coutable authored
Fix 404 error when visit group label edit page Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25158 See merge request !7957
-
Douwe Maan authored
Remove caching of Repository#has_visible_content? This MR removes the caching of `Repository#has_visible_content?`. The cache for this method is no longer necessary and this should solve the problem described in https://gitlab.com/gitlab-org/gitlab-ce/issues/25278. See merge request !7947
-
- 06 Dec, 2016 4 commits
-
-
Robert Schilling authored
A simpler implementation of finding a merge request ## What does this MR do? This cleans up some code in the issues API as discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7180#note_19501743 The helper method `merge_request_for_resolving_discussions` was no longer needed as it was only used once. That made it possible to simplify the implementation. ## 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)~~ - [x] ~~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? !7180 See merge request !7955
-
Jacob Schatz authored
Remove more pages css * Moves award emojis to `/framework` * Moves generic image styles to `/framework` * Removes `confirmation.scss` See merge request !7952
-
ja-me-sk authored
correct heading level for topics Update puppet dev ops report for 2016
-
Jacob Schatz authored
Remove dashboard.scss See merge request !7960
-