- 14 Jan, 2016 18 commits
-
-
Tomasz Maczukin authored
* master: (51 commits) Fix version Fix specs and rubocop warnings Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages fixed LDAP activation on login to use new ldap_blocked state Fix Admin/Users view to position buttons without spacing magic Update to Go 1.5.3 Fix the undefinded variable error in Project's safe_import_url method Update CHANGELOG [ci skip] Add some cosmetic changes to variables API documentation [ci skip] Fix misaligned edit button in milestone collection partial Update button styles for Milestones#show Modify builds API documentation style [ci skip] Modify :ci_variable factory Ensure the API doesn't return notes that the current user shouldn't see Add 'Build' prefix to Variables entry name in API docs index Fix some typos Add spec for Note#cross_reference_not_visible_for? Remove (invalid) timestamp formatting Move `BroadcastMessage#status` to a helper since it's presentational Update CHANGELOG ... Conflicts: doc/api/README.md lib/api/api.rb lib/api/entities.rb
-
Douwe Maan authored
Add variables API References #4264 See merge request !2264
-
Douwe Maan authored
Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages See #3956. Following is before/after for each page: ## Group title ### Before  ### After  --- ## Commit title ### Before  ### After  --- ## Branch name ### Before  ### After  --- ## Tags name in list ### Before  ### After  --- ## Tag name ### Before  ### After  --- ## Issue title in list ### Before  ### After  --- ## MR title in list ### Before  ### After  See merge request !2422
-
Douwe Maan authored
-
Tomasz Maczukin authored
-
Douwe Maan authored
-
Douwe Maan authored
LDAP Sync blocked user edgecases Allow GitLab admins to block otherwise valid GitLab LDAP users (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462) Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other. Expected behavior: - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?` - [x] "ldap_blocked" users can't be unblocked by the Admin UI - [x] "ldap_blocked" users can't be unblocked by the API - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked" - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked` Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users:  There will be another MR for the EE version. See merge request !2242
-
Douwe Maan authored
Fix the undefinded variable error in Project's safe_import_url method Fixes #7982 See merge request !2419
-
Douwe Maan authored
Show referenced MRs & Issues only when the current viewer can access them This addresses both issues identified in #6066. ## The private MR by user `remy2` with a note referencing to a public issue  --- ## The public issue viewed by user `remy` **who doesn't have access to `remy2/private-project`** before the fix  --- ## The public issue viewed by user `remy` **who doesn't have access to `remy2/private-project`** with the fix  --- ## The public issue viewed by user `remy2` with the fix (no change)  See merge request !2405
-
Douwe Maan authored
Allow broadcast messages to be edited Closes #3046 See merge request !2268
-
Dmitriy Zaporozhets authored
Update button style on milestone pages See merge request !2414
-
Rémy Coutable authored
-
Achilleas Pipinellis authored
Update documentation to Go 1.5.3 Security fix: https://groups.google.com/forum/#!topic/golang-dev/MEATuOi_ei4 See merge request !2418
-
Rémy Coutable authored
Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages
-
Gabriel Mazetto authored
-
Gabriel Mazetto authored
-
Stan Hu authored
-
DJ Mountney authored
-
- 13 Jan, 2016 22 commits
-
-
Tomasz Maczukin authored
-
Tomasz Maczukin authored
* 8-4-stable: (285 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Version 8.4.0.rc1 Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR ...
-
Tomasz Maczukin authored
-
Robert Speicher authored
-
Robert Speicher authored
-
Robert Speicher authored
-
Tomasz Maczukin authored
-
Tomasz Maczukin authored
-
Tomasz Maczukin authored
* master: (76 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR reverting _mr_title.html.haml ...
-
Tomasz Maczukin authored
-
Tomasz Maczukin authored
-
-
Grzegorz Bizon authored
Fix has been introduced in !2224.
-
Rémy Coutable authored
-
Achilleas Pipinellis authored
Move doc_styleguide in the development directory Reference #3841 And also add many new styleguides: - Naming - Images - Links - Headings - Formatting - Notes - API See merge request !2386
-
Drew Blessing authored
Added hint that you can search users by name, username, or email. Fixes gitlab-org/gitlab-ee#19 /cc @JobV See merge request !2411
-
Tomasz Maczukin authored
-
Tomasz Maczukin authored
-
Tomasz Maczukin authored
-
Achilleas Pipinellis authored
- Fix some syntax/grammar typos - Link to GFM documentation on newlines - Be less strict on the alphabetical order styleguide - You can override the "numbers in headings" rule if you discuss it first - Do not mention CE in notes if the feature is in both CE and EE
-
Rémy Coutable authored
-
Robert Speicher authored
-
