summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'zj-gitaly-encoding-issue' into 'master'Robert Speicher2018-03-011-1/+1
|\ | | | | | | | | | | | | Encode revision for gitattributes ref Closes gitaly#1032 and #43278 See merge request gitlab-org/gitlab-ce!17291
| * Encode revision for gitattributes refZeger-Jan van de Weg2018-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | A field didn't call the needed encoding helper, thus some UTF-8 encoding couldn't be encoded to ASCII. Using the helper method this was fixed. Tests are now run against Gitaly and Rugged too, to ensure both remain working correctly. Fixes gitlab-org/gitaly#1032, gitlab-org/gitlab-ce#43278
* | Merge branch '43425-projects-hooks-confidential-issues-events' into 'master'Rémy Coutable2018-03-014-5/+9
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Projects hooks : confidential_issues_events" Closes #43425 See merge request gitlab-org/gitlab-ce!17370
| * | align "confidential issues events" implementation with "issues events" oneJean-Baptiste Guerraz2018-03-014-5/+9
| | |
* | | Merge branch 'merge-requests-api-filter-by-branch' into 'master'Rémy Coutable2018-03-011-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add source and target branch filters to merge requests API Closes #42492 See merge request gitlab-org/gitlab-ce!17355
| * | | Add source and target branch filters to merge requests APISean McGivern2018-03-011-0/+2
| | | |
* | | | Merge branch 'dz-system-hooks-plugins' into 'master'Douwe Maan2018-03-013-0/+49
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add ability to use external plugins as system hooks See merge request gitlab-org/gitlab-ce!17003
| * | | Remove trailing line from plugin loggerdz-system-hooks-pluginsDmitriy Zaporozhets2018-02-281-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Improve plugins documentation and remove unnecessary rake taskDmitriy Zaporozhets2018-02-281-5/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Refactor plugins feature and make some doc improvementsDmitriy Zaporozhets2018-02-283-12/+14
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Refactor plugin execution methodDmitriy Zaporozhets2018-02-271-1/+10
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add plugin queue to sidekiq config [ci skip]Dmitriy Zaporozhets2018-02-262-3/+8
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Use Gitlab::Popen instead of spawn [ci skip]Dmitriy Zaporozhets2018-02-261-16/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Reorganize plugins dir structureDmitriy Zaporozhets2018-02-261-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Run plugins as separate process and pass data via STDINDmitriy Zaporozhets2018-02-262-32/+20
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Redesign plugins systemDmitriy Zaporozhets2018-02-262-22/+20
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Remove plugin initializer and add plugins:validate rake taskDmitriy Zaporozhets2018-02-262-0/+40
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add generator for pluginsDmitriy Zaporozhets2018-02-261-0/+25
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Update inline_javascript.rb to lint uses of the javascript filter as well as ↵Connor Shea2018-02-281-1/+7
| | | | | | | | | | | | | | | | script tags.
* | | | Update inline_javascript.rbWinnie Hellmann2018-02-281-2/+2
| | | |
* | | | Forbid all inline script tags in Linter::InlineJavaScriptWinnie Hellmann2018-02-281-1/+1
| |_|/ |/| |
* | | Merge branch 'gitaly-reenable-wiki' into 'master'Douwe Maan2018-02-281-3/+2
|\ \ \ | | | | | | | | | | | | | | | | Re-enable the remaning Wiki Gitaly-Endpoints See merge request gitlab-org/gitlab-ce!17422
| * | | Re-enable the remaning Wiki Gitaly-EndpointsKim Carlbäcker2018-02-281-3/+2
| | | |
* | | | Merge branch '43489-display-runner-ip' into 'master'Kamil Trzciński2018-02-282-8/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Display IP Address Of Runner On Runner Page" Closes #43489 See merge request gitlab-org/gitlab-ce!17286
| * | | Persist runner IP address on contact (#43489)Dylan Griffith2018-02-282-8/+14
| | | |
* | | | Fix code search results with non-ASCII data43531-500-error-searching-wiki-incompatible-character-encodings-utf-8-and-ascii-8bitSean McGivern2018-02-281-1/+3
|/ / / | | | | | | | | | | | | Gitlab::Git::Popen#popen now returns ASCII-8BIT (binary) data always, so we need to handle that explicitly.
* | | Merge branch 'rc/reduce-delta-with-ce-in-controllers-ce' into 'master'Douwe Maan2018-02-273-9/+15
|\ \ \ | | | | | | | | | | | | | | | | Remove explicit audit event log in MembershipActions See merge request gitlab-org/gitlab-ce!14824
| * | | Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ceRémy Coutable2018-02-273-9/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Remove explicit audit event log in MembershipActionsRémy Coutable2018-02-273-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move it to Members::ApproveAccessRequestService. Also, note that there was a double audit event log for access request destruction. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Fix a "can't modify frozen Hash" error in lib/api/services.rb in development envRémy Coutable2018-02-271-8/+11
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '40502-osw-keep-link-when-redacting-unauthorized-objects' into ↵Douwe Maan2018-02-272-10/+30
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Keep raw link when redacting unauthorized link object references Closes #40502 See merge request gitlab-org/gitlab-ce!17365
| * | | Keep link when redacting unauthorized object linksOswaldo Ferreira2018-02-272-10/+30
| | | |
* | | | Merge branch '43620-lib-api-services-rb-retains-a-lot-of-memory-and-objects' ↵Sean McGivern2018-02-271-42/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix a performance/memory issue in lib/api/services.rb Closes #43620 See merge request gitlab-org/gitlab-ce!17369
| * | | | Fix a performance/memory issue in lib/api/services.rb43620-lib-api-services-rb-retains-a-lot-of-memory-and-objectsRémy Coutable2018-02-261-42/+42
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'backstage/gb/build-stages-catch-up-migration' into 'master'Kamil Trzciński2018-02-271-0/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fully migrate build stages again Closes #38756 See merge request gitlab-org/gitlab-ce!15741
| * \ \ \ \ Merge commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af' into ↵backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-2315-11/+303
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/build-stages-catch-up-migration * commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af': (40 commits)
| * \ \ \ \ \ Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'Grzegorz Bizon2018-02-2225-191/+446
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | Use a helper to schedule pipeline stages migrationGrzegorz Bizon2018-02-161-2/+0
| | | | | | | |
| * | | | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-167-10/+21
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (38 commits)
| * \ \ \ \ \ \ \ Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'Grzegorz Bizon2018-02-1522-102/+181
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: db/schema.rb
| * | | | | | | | | Recover from unique constraint violation in stages migrationGrzegorz Bizon2018-02-151-9/+9
| | | | | | | | | |
| * | | | | | | | | Migrate pipeline stages in batches instead of single rowGrzegorz Bizon2018-02-141-54/+30
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-126-22/+32
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits)
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-09270-1541/+4482
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1480 commits) Conflicts: db/schema.rb
| * | | | | | | | | | | Fix rubocop offense in build stage migration classesGrzegorz Bizon2018-01-061-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Do not attempt to migrate legacy pipeline stagesGrzegorz Bizon2018-01-061-12/+21
| | | | | | | | | | | |
| * | | | | | | | | | | Fix Rubocop offenses in build status migrations :cop:Grzegorz Bizon2018-01-061-3/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Migrate a build stage completely in a background migrationGrzegorz Bizon2018-01-061-0/+67
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'slash-commands-changes-for-chatops' into 'master'Kamil Trzciński2018-02-272-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose ChatName objects to slash commands See merge request gitlab-org/gitlab-ce!17295
| * | | | | | | | | | | Expose ChatName objects to slash commandsslash-commands-changes-for-chatopsYorick Peterse2018-02-232-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of only exposing a User to slash commands we now also expose the ChatName object that the User object is retrieved from. This is necessary for GitLab Chatops as we need for example the user ID of the chat user.
View Lorry Controller Status