summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Use #parts instead of #part to read all the parts of the Message.Ruben Davila2017-01-091-2/+2
| |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like I was accidentally using #part which was adding an extra empty Mime section
* | | | | | | | | | | | | | | Merge branch '19086-double-newline' into 'master' Sean McGivern2017-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Double Spaced CI Log Closes #19086 See merge request !8349
| * | | | | | | | | | | | | | Replace carriage return combos with line breaks tagsJared Deckard2016-12-281-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'feature/log-ldap-to-application-log' into 'master' Rémy Coutable2017-01-091-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log LDAP blocking/unblocking events to application log See merge request !8042
| * | | | | | | | | | | | | | | fixup! Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-4/+22
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '26051-fix-missing-endpoint-route-method' into 'master' tc-add-gitlab-flow-to-engineeringRémy Coutable2017-01-093-3/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't instrument 405 Grape calls Closes #26051 See merge request !8445
| * | | | | | | | | | | | | | | | Don't instrument 405 Grape calls26051-fix-missing-endpoint-route-methodRémy Coutable2017-01-093-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #26051. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern2017-01-091-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record and show last used date of SSH Keys See merge request !8113
| * | | | | | | | | | | | | | | | Record and show last used date of SSH KeysVincent Wong2017-01-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses: Issue #13810 1. Adds a last_used_at attribute to the Key table/model 2. Update a key's last_used_at whenever it gets used 3. Display how long ago an ssh key was last used
* | | | | | | | | | | | | | | | | Merge branch 'fix-users-api-500-error' into 'master' Rémy Coutable2017-01-061-7/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 errors when creating a user with identity via API Closes #26295 See merge request !8442
| * | | | | | | | | | | | | | | | | Fix the failing spec in POST /users APIfix-users-api-500-errorRémy Coutable2017-01-051-7/+4
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | LDAP attributes needs default valuesDrew Blessing2017-01-063-7/+15
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch ↵Rémy Coutable2017-01-051-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19966-api-call-to-move-project-to-different-group-fails-when-using-group-and-project-names-instead-of-id' into 'master' Fix groups API to accept path when transferring a project Closes #19966 See merge request !8408
| * | | | | | | | | | | | | | | | Fix groups API to accept path when transferring a projectMark Fletcher2017-01-031-3/+3
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use standard helpers for finding group and project
* | | | | | | | | | | | | | | | Merge branch ↵Rémy Coutable2017-01-051-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26261-post-api-v3-projects-idorproject-commits-commits-does-not-work-with-project-path' into 'master' Fix Commits API to accept a Project path upon POST Closes #26261 See merge request !8406
| * | | | | | | | | | | | | | | Fix Commits API to accept a Project path upon POSTMark Fletcher2017-01-031-1/+0
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'rs-absorb-gitlab_git' into 'master' Douwe Maan2017-01-0518-0/+2950
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Absorb gitlab_git Closes #24374 See merge request !8447
| * | | | | | | | | | | | | | | Ensure internal Gitlab::Git references use the namespacers-absorb-gitlab_gitRobert Speicher2017-01-045-25/+25
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Absorb gitlab_gitRobert Speicher2017-01-0418-0/+2950
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'zj-404-slack-error' into 'master' Kamil Trzciński2017-01-051-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API route slack slash commands Closes #25954 See merge request !8362
| * | | | | | | | | | | | | | Add API route slack slash commandszj-404-slack-errorZ.J. van de Weg2017-01-031-0/+7
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'api-refactor-issues-filter' into 'master' Sean McGivern2017-01-041-21/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor issues filter in API See merge request !8432
| * | | | | | | | | | | | | | | Add missing milestone parameterRobert Schilling2017-01-041-0/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Refactor issues filter in APIRobert Schilling2017-01-041-21/+7
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'fix-api-project-hooks-params' into 'master' Sean McGivern2017-01-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project hooks params Closes #26291 See merge request !8425
| * | | | | | | | | | | | | | | Fix project hooks paramsfix-api-project-hooks-paramsRobert Schilling2017-01-031-1/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ldap_person_attributes' into 'master' include-uncovered-jasmineRobert Speicher2017-01-031-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::LDAP::Person uses LDAP attributes configuration Closes #26290 See merge request !8418
| * | | | | | | | | | | | | | Gitlab::LDAP::Person uses LDAP attributes configurationDrew Blessing2017-01-031-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We allow users to configure LDAP attribute preferences. For example, email can be configured to use `mail`, `email` and `userPrincipalName`, falling through to the next until a value is found. Prior to this change, Gitlab::LDAP::Person did not honor this configuration. Now, the class will honor `name` and `mail` configuration. It does not handle `username`, or fallback to `first_name` + `last_name` in the absence of `name`.
* | | | | | | | | | | | | | | Merge branch 'zj-revert-polymorphic-url' into 'master' Kamil Trzciński2017-01-031-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert specific URL See merge request !8321
| * | | | | | | | | | | | | | Revert specific URLzj-revert-polymorphic-urlZ.J. van de Weg2016-12-271-3/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'fix/cross-project-ref-path' into 'master' Sean McGivern2017-01-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross-project references copy to include the project reference Closes #25890 See merge request !8232
| * | | | | | | | | | | | | | | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-031-1/+1
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
* | | | | | | | | | | | | | | API: extern_uid is a stringapi-fix-extern-uid-validationRobert Schilling2017-01-031-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'grapify-settings-api' into 'master' Sean McGivern2016-12-291-12/+106
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the settings API See merge request !8336
| * | | | | | | | | | | | | Grapify the settings APIgrapify-settings-apiRobert Schilling2016-12-291-12/+106
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'clean-api-params' into 'master' Sean McGivern2016-12-281-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parameter already enforced via grape See merge request !8344
| * | | | | | | | | | | | | | Parameter already enforced via grapeclean-api-paramsRobert Schilling2016-12-281-2/+0
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'fix-api-deprecation' into 'master' Robert Schilling2016-12-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a Grape deprecation, use `#request_method` instead of `#route_method` See merge request !8297
| * | | | | | | | | | | | | Fix a Grape deprecation, use `#request_method` instead of `#route_method`fix-api-deprecationRémy Coutable2016-12-231-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'issues/8081' into 'master' Annabel Dunstone Gray2016-12-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues/8081 See merge request !7908
| * | | | | | | | | | | | rename theme to match actual colorsBM5k2016-12-061-1/+1
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-276-81/+107
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to add deploy keys with write-access Closes #1376 See merge request !7383
| * | | | | | | | | | | | Rubocop prefers to indent this wayfeature/1376-allow-write-access-deploy-keysLin Jen-Shin2016-12-201-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use consistent names and move checks to the method,Lin Jen-Shin2016-12-201-39/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and move those checks to be private. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_20285012 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_20285279
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-2098-646/+2756
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (538 commits) Reject blank environment vcariables in Gitlab::Git::RevList Add online terminal documentation Add changelog entry Add terminal UI and controller actions Fix specs Even out padding on plus button in breadcrumb menu Update font size of detail page header to 14px Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Fix Route#rename_children behavior Remove inline-block styling from status Add terminals to the Kubernetes deployment service Add a ReactiveCaching concern for use in the KubernetesService Add xterm.js 2.1.0 and a wrapper class to the asset pipeline Remove unnecessary hidden svg elements for icons. Fix consistent typo in environment.js Use a block to insert extra check for authenticate_build! Align milestone column header with count number Add Wiki import to BB importer Make CI badge hitboxes better match container ...
| * | | | | | | | | | | | Merge CSSFilipa Lacerda2016-12-1234-233/+711
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Check project existence for push too, andLin Jen-Shin2016-12-101-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't have to check for deploy key for downloading because deploy key could certainly download when it could already read the project. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_19578626
| * | | | | | | | | | | | | Don't pass the actor for deploy key, feedback:Lin Jen-Shin2016-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_19579483
| * | | | | | | | | | | | | Prefer guest_can_download_code? and fix typoLin Jen-Shin2016-12-062-3/+3
| | | | | | | | | | | | | |