summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dz-nested-groups-members' into 'master' Dmitriy Zaporozhets2017-03-091-1/+7
|\ | | | | | | | | | | | | Show members of parent groups on project members page Closes #28786 and #27962 See merge request !9764
| * Fix group members method for project import/exportDmitriy Zaporozhets2017-03-091-1/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master' Kamil Trzciński2017-03-092-1/+25
|\ \ | |/ |/| | | | | | | | | Verbosify blocked pipeline status description Closes #29134 See merge request !9800
| * Verbosify blocked pipeline status descriptionGrzegorz Bizon2017-03-082-1/+25
| |
* | Refactor some code29034-fix-github-importerGabriel Mazetto2017-03-081-2/+6
| |
* | Fix name colision when importing GitHub pull requests from forked repositoriesGabriel Mazetto2017-03-081-1/+5
| |
* | Fix reference to node_modules in built packageEric Eastwood2017-03-081-1/+1
| | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29192 See https://gitlab.slack.com/archives/frontend/p1488973548024005
* | Merge branch 'fix/29093' into 'master' Sean McGivern2017-03-081-1/+1
|\ \ | |/ |/| | | | | | | | | Fix 'Object not found - no match for id (sha)' when importing GitHub PRs Closes #29093 See merge request !9751
| * Fix 'Object not found - no match for id (sha)' when importing GitHub PRsDouglas Barbosa Alexandre2017-03-071-1/+1
| |
* | Merge branch 'dm-nested-groups-go-get' into 'master' Douwe Maan2017-03-081-9/+57
|\ \ | | | | | | | | | | | | Fix go-get support for projects in nested groups See merge request !9793
| * | Fix go-get support for projects in nested groupsdm-nested-groups-go-getDouwe Maan2017-03-071-9/+57
| | |
* | | Returns correct header data for commits endpointOswaldo Ferreira2017-03-071-6/+9
| | |
* | | Fix pagination headers for repository commits api endpointGeorge Andrinopoulos2017-03-071-1/+10
|/ /
* | Added Prometheus Service and Prometheus graphsKamil Trzciński2017-03-071-0/+70
| |
* | Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-071-3/+11
|\ \
| * | Require explicit scopes on personal access tokensMarkus Koller2017-03-071-1/+4
| | | | | | | | | | | | | | | | | | Gitlab::Auth and API::APIGuard already check for at least one valid scope on personal access tokens, so if the scopes are empty the token will always fail validation.
| * | Only use API scopes for personal access tokensMarkus Koller2017-03-071-2/+7
| | |
| * | Don't allow blocked users to authenticate through other meansMarkus Koller2017-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Auth.find_with_user_password is currently used in these places: - resource_owner_from_credentials in config/initializers/doorkeeper.rb, which is used for the OAuth Resource Owner Password Credentials flow - the /session API call in lib/api/session.rb, which is used to reveal the user's current authentication_token In both cases users should only be authenticated if they're in the active state.
| * | Implement OpenID Connect identity providerMarkus Koller2017-03-071-1/+1
| | |
* | | Merge remote-tracking branch ↵Douwe Maan2017-03-071-12/+7
|\ \ \ | |/ / |/| | | | | 'origin/personal_access_token_api_and_impersonation_token'
| * | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-061-1/+1
| | |
| * | refactors finder and correlated codeTiago Botelho2017-03-011-1/+1
| | |
| * | applies relevant changes to the code and code structureTiago Botelho2017-02-281-2/+2
| | |
| * | add impersonation tokenSimon Vocella2017-02-281-12/+7
| | |
* | | Merge branch 'feature/runner-jobs-v4-api' into 'master' Kamil Trzciński2017-03-072-0/+79
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Feature/runner jobs v4 api Closes #28513 See merge request !9273
| * | | Add minor refactoringfeature/runner-jobs-v4-apiTomasz Maczukin2017-03-072-18/+7
| | | |
| * | | Add some fixes and refactoring after reviewTomasz Maczukin2017-03-024-64/+90
| | | |
| * | | Fix rubocop offensesTomasz Maczukin2017-03-021-3/+3
| | | |
| * | | Update step data namingTomasz Maczukin2017-03-021-12/+10
| | | |
| * | | Fix rubocop offensesTomasz Maczukin2017-03-022-2/+2
| | | |
| * | | Refactor JobRequest response structureTomasz Maczukin2017-03-022-0/+66
| | | |
* | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-03-0719-143/+355
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set-default-cache-key-for-jobs * upstream/master: (289 commits) re-add Assign to Me link on new MR/Issue forms thinner bottom header border make header match old 16px padding of body contents Update font-awesome-rails to 4.7.0.1 Relax font-awesome-rails dependency to ~> 4.7 Restore keyboard shortcuts for "Activity" and "Charts" fix border radius bottom for header match padding for mr-widget sections Update changelog Fix project-last-commit alignment Docs: update GL Pages IP on GL.com Fix up @DouweM review Remove readme-only project view preference Add `uploads` to known models for Import/Export spec Add `has_many` associations for models that can have Upload records Handle relative and absolute Upload paths in the Uploaders Change the default CarrierWave root path for tests Fix Projects::UploadService spec Add a Project::UploadsController spec to ensure an Upload is created Add `RecordsUploads` module to record Upload records via callbacks ...
| * \ \ \ Merge branch '23948-assign-to-me' into 'master' Alfredo Sumaran2017-03-071-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | re-add Assign to Me link on new MR/Issue forms Closes #23948 See merge request !9499
| | * | | | re-add Assign to Me link on new MR/Issue formsSimon Knox2017-03-071-0/+1
| | | | | |
| * | | | | Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-073-86/+43
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add emoji images - Base Native Unicode Emojis Closes #26371 See merge request !9569
| | * | | | | Fix up @DouweM reviewEric Eastwood2017-03-062-20/+23
| | | | | | |
| | * | | | | Fix wrong image src with cached gl-emoji and relative rootEric Eastwood2017-03-062-3/+4
| | | | | | |
| | * | | | | Use native unicode emojisEric Eastwood2017-03-063-73/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - gl_emoji for falling back to image/css-sprite when the browser doesn't support an emoji - Markdown rendering (Banzai filter) - Autocomplete - Award emoji menu - Perceived perf - Immediate response because we now build client-side - Update `digests.json` generation in gemojione rake task to be more useful and include `unicodeVersion` MR: !9437 See issues - #26371 - #27250 - #22474
| * | | | | | Merge branch 'use-publish-to-post-notifications' into 'master' Rémy Coutable2017-03-071-0/+13
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Use publish channel to post notifications changes See merge request !9574
| | * | | | | Update notification codeKamil Trzcinski2017-03-061-3/+2
| | | | | | |
| | * | | | | Add specs for notificationsKamil Trzcinski2017-03-031-1/+1
| | | | | | |
| | * | | | | Add support for Workhorse notificationsKamil Trzcinski2017-03-031-0/+14
| | | | | | |
| * | | | | | Merge branch 'pipeline-blocking-actions' into 'master' Kamil Trzciński2017-03-065-26/+30
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make manual actions blocking Closes #26360 and #22628 See merge request !9585
| | * | | | | Merge branch 'master' into pipeline-blocking-actionspipeline-blocking-actionsGrzegorz Bizon2017-03-062-0/+98
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Fix UserBasic Rename `/take` to `/take_ownership`, expose `owner` in `v3`. Update after review Fix values being called at Array instead of Hash Fix json response in branches controller Improve docs and specs related to pages artifacts Add MR fo changelog about removing pages artifacts Delete artifacts for pages unless expiry date is specified Lint doc Improved team selection Move foreign key to separate migration Fix import model attributes Update documentation and expose ID Introduce tests for pipeline triggers Fix trigger model Update db/schema Make triggers to be user aware Make Pipeline Triggers to be user aware Update triggers API Remove remnants of git annex ... Conflicts: db/schema.rb
| | * | | | | | Improve specs for detailed statuses with manual actionsGrzegorz Bizon2017-03-062-24/+0
| | | | | | | |
| | * | | | | | Ignore job by default if it is a manual actionGrzegorz Bizon2017-03-061-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to maintain backwards compatibility with configs created when manual actions were non-blocking. From now manual actions are blocking if configured with `allow_failure: false`, otherwise manual actions are optional, and their status is ignored.
| | * | | | | | Reinstitute a core `manual` status for manual actionsGrzegorz Bizon2017-03-062-4/+4
| | | | | | | |
| | * | | | | | Introduce core status for blocked manual actionsGrzegorz Bizon2017-03-061-3/+3
| | | | | | | |
| | * | | | | | Refactor code related to pipeline blocking actionsGrzegorz Bizon2017-03-061-4/+0
| | | | | | | |
| | * | | | | | Make manual actions blockingKamil Trzcinski2017-03-062-0/+23
| | | |_|/ / / | | |/| | | |
View Lorry Controller Status