summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* removes trailing commas21622-group-member-counter-and-sortNur Rony2016-11-102-3/+2
|
* removes utf-8 params from helper functionNur Rony2016-11-101-3/+2
|
* moves filter path functions to members helperNur Rony2016-11-102-13/+13
|
* syncs changelog with master and using new changelog cliNur Rony2016-11-102-66/+4
|
* removes redundant entries from changelogNur Rony2016-11-101-3/+1
|
* changelog entry addeds under release 8.14Nur Rony2016-11-101-0/+45
|
* removes extra new lineNur Rony2016-11-101-1/+0
|
* adds sort functionality in rubyNur Rony2016-11-101-3/+6
|
* removes unnecessary css rules and adds sort dropdown project memebersNur Rony2016-11-103-13/+8
|
* rename member function name as it same dropdown is shared for group and ↵Nur Rony2016-11-102-2/+2
| | | | project members
* adds params default value for utf8Nur Rony2016-11-101-2/+2
|
* adds entry in CHANGELOGNur Rony2016-11-102-1/+23
|
* adds functionality for group member sortingNur Rony2016-11-101-3/+7
|
* removes unnecessary return statement form sorting helperNur Rony2016-11-101-3/+1
|
* adds helper function for paramsNur Rony2016-11-102-1/+14
|
* adds sort dropdown for group membersNur Rony2016-11-104-15/+100
|
* Fix CHANGELOG after 8.14.0-rc1 tagAlejandro Rodríguez2016-11-091-3/+0
|
* Update CHANGELOG.md for 8.14.0-rc1Alejandro Rodríguez2016-11-0932-126/+34
| | | [ci skip]
* Fix YAML syntax on CHANGELOG entryAlejandro Rodríguez2016-11-091-1/+1
|
* Merge branch '24341-fix-failure' into 'master' Stan Hu2016-11-092-2/+2
|\ | | | | | | | | | | | | Remove order-dependent expectation Fixes #24341, hopefully See merge request !7385
| * Remove order-dependent expectation24341-fix-failureRémy Coutable2016-11-092-2/+2
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'rs-doc-highlighting' into 'master' Achilleas Pipinellis2016-11-093-15/+15
|\ \ | |/ |/| | | | | | | | | | | Add more highlighting to development docs Now that docs.gitlab.com has lovely highlighting, we should make sure we use it everywhere it makes sense! See merge request !7369
| * Add more highlighting to Shell Commands docrs-doc-highlightingRobert Speicher2016-11-091-4/+4
| | | | | | | | [ci skip]
| * Add more highlighting to Instrumentation docRobert Speicher2016-11-091-5/+5
| | | | | | | | [ci skip]
| * Add more highlighting to Migration Style Guide docRobert Speicher2016-11-091-6/+6
| | | | | | | | [ci skip]
* | Merge branch '23731-add-param-to-user-api' into 'master' Sean McGivern2016-11-094-1/+45
|\ \ | | | | | | | | | | | | | | | | | | Add query param to filter users by 'external' & 'blocked' type on API Closes #23731 See merge request !7109
| * | Add query param to filter users on 'external' & 'blocked' type on APIYatish Mehta2016-11-084-1/+45
| | |
* | | Merge remote-tracking branch 'dev/master'Robert Speicher2016-11-091-5/+4
|\ \ \
| * | | Minor CHANGELOG.md cleanupsRobert Speicher2016-11-091-5/+4
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'docs/add-git-cheatsheet' into 'master' Achilleas Pipinellis2016-11-091-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Add a link to Git cheatsheet PDF in docs readme See merge request !7382
| * | | Add a link to Git cheatsheet PDF in docs readmeAchilleas Pipinellis2016-11-091-0/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch '22058-auto-selection' into 'master' Fatih Acet2016-11-092-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change auto selection behaviour of emoji and slash commands to be more UX/Type friendly ## What does this MR do? In the context of a special command (starting with "/", ":", ...), the MR disables auto selection of first item in the dropdown suggestion menu, until at least a character has been typed. This behavior change originated from #22058 and #23578 in which problems with the ":" special command were pointed out. ## Are there points in the code the reviewer needs to double check? At lines +187 and +242 there were originally no sorters. Given what ``DefaultOptions.sorter`` does, I don't think it is a problem. ## Why was this MR needed? To solve #22058 and #23578 ## 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 #22058 and #23578 See merge request !7129
| * | | | Fixes #22058 and #23578Yann Gravrand2016-11-062-0/+5
| | | | |
* | | | | Merge branch 'ldap_check_bind' into 'master' Sean McGivern2016-11-099-78/+226
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve ldap:check errors Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21621. See merge request !6601
| * | | | | Introduce better credential and error checking to `rake gitlab:ldap:check`Drew Blessing2016-11-089-78/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was previously possible for invalid credential errors to go unnoticed in this task. Users would believe everything was configured correctly and then sign in would fail with 'invalid credentials'. This adds a specific bind check, plus catches errors connecting to the server. Also, specs :)
* | | | | | Merge branch 'remove-heading-space-from-diff-content' into 'master' Alfredo Sumaran2016-11-096-26/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove an extra leading space from diff paste data ## What does this MR do? Remove an extra leading space from diff paste data. ## Are there points in the code the reviewer needs to double check? I have checked the following three patterns. * inline diff * parallel diff * blob preview ## Why was this MR needed? Diff paste data contain an extra leading space. So it need to remove an extra leading space manually from pasted diff data. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [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? #14176 Closes #23899 See merge request !7133
| * | | | | | Remove an extra leading space from diff contentHiroyuki Sato2016-11-046-26/+28
| | | | | | |
* | | | | | | Merge branch 'pipeline-notifications' into 'master' Sean McGivern2016-11-0923-136/+344
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate CI emails into notification system Closes #21930 See merge request !6342
| * | | | | | | Try to cover more cases about receivers of pipeline notificationspipeline-notificationsLin Jen-Shin2016-11-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_17981421
| * | | | | | | Add failed_pipeline and success_pipeline to API docLin Jen-Shin2016-11-081-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_17981448
| * | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-08179-1055/+2665
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (70 commits) Fix routing spec for group controller Add small improvements to constrainers and specs Faster search Fix broken commits search Changed helper method to check for none on params Moved if statements around in view API: Return 400 when creating a systemhook fails Update non-exist group spinach test to match routing Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2 Replace trigger with the new ID of the docs project Refactor method name 17492 Update link color for more accessible contrast Fixed todos empty state when filtering Refactor namespace regex implements reset incoming email token on issues modal and account page, reactivates all tests and writes more tests for it Use separate email-friendly token for incoming email and let incoming email token be reset Use the Gitlab Workhorse HTTP header in the admin dashboard Refactor project routing Fix 404 when visit /projects page Rewritten spinach git_blame tests to rspec feature tests Add tests for project#index routing ...
| * | | | | | | No need to set author for GitLab membersLin Jen-Shin2016-11-051-1/+1
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-05160-558/+1710
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (74 commits) Fetch locals to avoid undefined method/local error Remove author according to the document Simplify implementation of entity serializers Add documentation for the "Only allow merge requests to be merged if all discussions are resolved" feature Complete and improve specs Add setting to only allow merge requests to be merged when all discussions are resolved Apply `*_params_ce + *_params_ee` pattern to MergeRequestsController Add tests for deployment and environment entitites Add tests for serialization entities, add user entity Only skip group when it's actually a group in the "Share with group" select Fix: Todos Filter Shows All Users Fix: Guest sees some repository details and gets 404 Move shared params to a helper GrapeDSL for project hooks Update commits.scss updated styling commit SHA on branches page + added to changelog change build list height to show 6,5 builds + improve padding of list, with first/last child selectors Refine build entity tests a little Expose commit author if author exists Ignore builds directory from eslint ...
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-0457-358/+891
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (23 commits) Clarify the author field for the changelog documentation Add and update .gitignore & .gitlab-ci.yml templates for 8.14 Update "Installation from source" guide for 8.14.0 Add CHANGELOG entries for latest patches Merge branch 'fix/import-export-symlink-vulnerability' into 'security' Merge branch 'fix/import-projectmember-security' into 'security' Use stubs instead of modifying global states Add changelog instructions to CHANGELOG.md Try not to include anything globally! Update help banner for bin/changelog Update docs and test description Update docs and unexpose token Initialize form validation on new group form. Unchange username_validator. Move snake_case to camelCase. Change show-gl-field-errors to gl-show-field-errors Fix changelog. List gl_field_error as gl_field_errors dep. Break out GlFieldError into separate file. Add gl field errors to group name edit form. ...
| * | | | | | | | | Update CHANGELOGLin Jen-Shin2016-11-042-1/+6
| | | | | | | | | |
| * | | | | | | | | Try to reduce conflictsLin Jen-Shin2016-11-031-2/+1
| | | | | | | | | |
| * | | | | | | | | Fix CHANGELOGLin Jen-Shin2016-11-031-27/+1
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-0343-295/+1568
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (26 commits) Add a `--force` option to bin/changelog Update examples in changelog docs to use single quotes around title Use the server's base URL without relative URL part when creating links in JIRA Make ESLint ignore instrumented files for coverage analysis (!7236) Check that JavaScript file names match convention (!7238) Removed z-index for filters on issue boards GitLab 8.13 not 13 Replace MR Description Format links Fix gdb backtrace command Update gitlab.yml.example remove extra spaces from app/workers/post_receive.rb Add Rake task to create/repair GitLab Shell hooks symlinks Added guide for upgrading Postgres using Slony Ensure hook tokens are write-only in the API Add support for token attr in project hooks API Add a CHANGELOG entry Fix edit button wiki Updated Sortable JS plugin Allow owners to fetch source code in CI builds fixes milestone dropdown not select issue ...
| * | | | | | | | | | Add pipelines to notifications documentationLin Jen-Shin2016-11-031-0/+3
| | | | | | | | | | |
| * | | | | | | | | | Add failed_pipeline and success_pipeline to API docLin Jen-Shin2016-11-021-1/+3
| | | | | | | | | | |