summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix API not accepting job_events for webhookszj-api-fix-build-eventsZ.J. van de Weg2017-04-121-3/+9
| | | | | | | | | | When renaming, the argument on the projects hook API was forgotten. Now one could successfully set it again. The fix is a little ugly stylewise, but needed as the underlying model still refers to it as build_events. This commit is to fix it, later we should migrate the data to a new column. The edit on the spec file makes sure it passes now, and will fail when we migrate the column.
* Merge branch 'bb_save_trace' into 'master' Sean McGivern2017-04-122-6/+4
|\ | | | | | | | | [BB Importer] Save the error trace and the whole raw document See merge request !9604
| * [BB Importer] Save the error trace and the whole raw documentbb_save_traceValery Sizov2017-04-112-6/+4
| |
* | Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-111-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572
| * | Cache MR diffs by diff refsDouwe Maan2017-04-081-0/+6
| | |
* | | Merge branch '28017-separate-ce-params-on-api' into 'master' Douwe Maan2017-04-116-30/+111
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "API: Separate CE params to avoid wrong conflict resolutions" Closes #28017 See merge request !10484
| * | Add share_with_group_lock to CE optional params block28017-separate-ce-params-on-apiOswaldo Ferreira2017-04-101-0/+1
| | |
| * | Separate CE params on Grape APIOswaldo Ferreira2017-04-106-30/+110
| | |
* | | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' Kamil Trzciński2017-04-111-0/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix container repository/tag location text copied into the clipboard Closes #30695 See merge request !10587
| * | Add method that returns location of registry imageGrzegorz Bizon2017-04-101-0/+4
| |/
* | Merge branch 'backport-ee-1525' into 'master' Robert Speicher2017-04-108-57/+91
|\ \ | | | | | | | | | | | | Backport Git-env code from EE "Fix push rules on Git 2.11" (gitlab-org/gitlab-ee!1525) See merge request !10547
| * | Don't pass `env` anymore to GitAccess, ChangeAccess, and ForcePushbackport-ee-1525Rémy Coutable2017-04-103-7/+4
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs methodRémy Coutable2017-04-102-31/+28
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Retrieve Git-specific env in Gitlab::Git::Repository#ruggedRémy Coutable2017-04-101-1/+9
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Set Git-specific env in /api/internal/allowedRémy Coutable2017-04-102-18/+12
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Add a Gitlab::Git::Env to store Git-specific env thread-safelyRémy Coutable2017-04-101-0/+38
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'merge-request-parser-merge-requests-for-nodes' into 'master' Douwe Maan2017-04-101-11/+30
|\ \ \ | |/ / |/| | | | | | | | Reuse "merge_requests_for_nodes" in "MergeRequestParser" See merge request !10585
| * | Reuse "merge_requests_for_nodes" in "MergeRequestParser"merge-request-parser-merge-requests-for-nodesAdam Niedzielski2017-04-101-11/+30
| | |
* | | Test all enabled routes in ETag caching middleware and fix pipeline routestest-all-etag-routesAdam Niedzielski2017-04-102-34/+41
|/ / | | | | | | | | | | | | | | | | | | Extract route matching logic to Gitlab::EtagCaching::Router. Fix pipeline routes: 1. "project_pipelines" has to come after "commit_pipelines" and "merge_request_pipelines" because it is more generic 2. "commit_pipelines": "\s" (any whitespace character) => "\S" (any non-whitespace character).
* | Remove the User#is_admin? methodblackst0ne2017-04-0913-22/+22
|/
* Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-0710-40/+138
|\
| * Merge branch 'adam-finish-5993-closed-issuable' into 'master' Douwe Maan2017-04-079-40/+124
| |\ | | | | | | | | | | | | | | | | | | Add indication for closed or merged issuables in GFM Closes #1369 See merge request !9462
| | * Add indication for closed or merged issuables in GFMadam-finish-5993-closed-issuableAdam Buckland2017-04-079-40/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: for issues that are closed, the links will now show '[closed]' following the issue number. This is done as post-process after the markdown has been loaded from the cache as the status of the issue may change between the cache being populated and the content being displayed. In order to avoid N+1 queries problem when rendering notes ObjectRenderer populates the cache of referenced issuables for all notes at once, before the post processing phase. As a part of this change, the Banzai BaseParser#grouped_objects_for_nodes method has been refactored to return a Hash utilising the node itself as the key, since this was a common pattern of usage for this method.
| * | Merge branch 'feature/add-rake-task-prints-storage-config-in-toml' into ↵Robert Speicher2017-04-071-0/+14
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 'master' Add rake task that prints TOML storage configuration Closes gitaly#173 See merge request !10448
| | * Add rake task that prints TOML storage configurationfeature/add-rake-task-prints-storage-config-in-tomlAhmad Sherif2017-04-041-0/+14
| | | | | | | | | | | | Closes gitaly#173
* | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-078-23/+169
|\ \ \ | |/ /
| * | Fix rake test to import Github repositoriesDouglas Barbosa Alexandre2017-04-071-2/+9
| | |
| * | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' Kamil Trzciński2017-04-071-0/+103
| |\ \ | | | | | | | | | | | | | | | | Fix invalidating Project build status cache to often See merge request !10313
| | * | Take the ref of a pipeline into account when caching statusBob Van Landuyt2017-04-071-9/+18
| | | |
| | * | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`Bob Van Landuyt2017-04-071-1/+1
| | | |
| | * | Wrap updating of cache after pipeline transition in class methodBob Van Landuyt2017-04-071-0/+4
| | | |
| | * | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatusBob Van Landuyt2017-04-071-0/+90
| | | |
| * | | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-076-21/+57
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356
| | * | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0624-151/+533
| | |\ \ | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml
| | * \ \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-0612-23/+279
| | |\ \ \
| | * | | | Fix projected import failing on missing relationsJames Edwards-Jones2017-04-061-1/+5
| | | | | |
| | * | | | Protected Tags backend review changesJames Edwards-Jones2017-04-061-8/+2
| | | | | | | | | | | | | | | | | | Added changelog
| | * | | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0677-359/+1041
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss
| | * | | | | Fixed UserAccess#can_create_tag? after create_access_levels renameJames Edwards-Jones2017-04-041-1/+1
| | | | | | |
| | * | | | | Renamed ProtectedTag push_access_levels to create_access_levelsJames Edwards-Jones2017-04-042-2/+2
| | | | | | |
| | * | | | | Attempt to fix import/export of push_access_levels for protected tagsJames Edwards-Jones2017-04-042-1/+4
| | | | | | |
| | * | | | | Cleanup & tests for UserAccess#can_create_tag?James Edwards-Jones2017-04-042-8/+5
| | | | | | |
| | * | | | | Fixed developers_can_push in RepoBranch API entityJames Edwards-Jones2017-04-041-6/+2
| | | | | | |
| | * | | | | Protected Tags prevents all updates instead of just force pushes.James Edwards-Jones2017-04-041-5/+9
| | | | | | | | | | | | | | | | | | | | | This only changes behaviour for masters, as developers are already prevented from updating/deleting tags without the Protected Tags feature
| | * | | | | Clean up non TODO rubocop errorsJames Edwards-Jones2017-04-032-5/+5
| | | | | | |
| | * | | | | Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-033-6/+6
| | | | | | |
| | * | | | | Extract ProtectedRef ConcernJames Edwards-Jones2017-04-032-10/+5
| | | | | | |
| | * | | | | Added ‘protected’ label and disabled delete button for tags index/showJames Edwards-Jones2017-03-311-1/+1
| | | | | | |
| | * | | | | Protected Tags enforced over gitJames Edwards-Jones2017-03-312-5/+48
| | | | | | |
* | | | | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0715-39/+311
|\ \ \ \ \ \ \ | |/ / / / / /
View Lorry Controller Status