Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Extend Cluster Applications to install GitLab Runner to Kubernetes cluster | Mayra Cabrera | 2018-03-01 | 6 | -111/+174 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master' | Douwe Maan | 2018-03-01 | 14 | -78/+78 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359 | |||||
| * | | | | | | Moved o_auth/saml/ldap modules under gitlab/auth | Horatiu Eugen Vlad | 2018-02-28 | 14 | -78/+78 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch '41777-include-cycle-time-in-usage-ping' into 'master' | Douwe Maan | 2018-03-01 | 5 | -6/+164 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Include cycle time in usage ping" Closes #41777 See merge request gitlab-org/gitlab-ce!16793 | |||||
| * | | | | | | | Adapt cycle analytics spec helper and cycle analytics usage data spec41777-include-cycle-time-in-usage-ping | Tiago Botelho | 2018-03-01 | 4 | -35/+141 | |
| | | | | | | | | ||||||
| * | | | | | | | Refactors median code to work with both single and multiple projects | Tiago Botelho | 2018-02-28 | 2 | -0/+51 | |
| | | | | | | | | ||||||
| * | | | | | | | Restrict cycle analytics usage data to instances that use postgres only | Tiago Botelho | 2018-02-28 | 1 | -0/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'zj-licensee-key' into 'master'43548-update-language-about-usage-ping-in-admin-settings-and-docs | Sean McGivern | 2018-03-01 | 1 | -0/+29 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client implementation for Licensee#key See merge request gitlab-org/gitlab-ce!17449 | |||||
| * | | | | | | | | Client implementation for Licensee#key | Zeger-Jan van de Weg | 2018-03-01 | 1 | -0/+29 | |
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Part of the migration as tracked in: gitlab-org/gitaly#1026 | |||||
* | | | | | | | | Merge branch '42434-allow-commits-endpoint-to-work-over-all-commits' into ↵ | Douwe Maan | 2018-03-01 | 1 | -4/+28 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Allow API method /projects/:id/repository/commits to work over all commits" Closes #42434 See merge request gitlab-org/gitlab-ce!17182 | |||||
| * | | | | | | | | Add specs42434-allow-commits-endpoint-to-work-over-all-commits | Tiago Botelho | 2018-03-01 | 1 | -4/+28 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'feature/gb/pipeline-variable-expressions' into 'master' | Kamil Trzciński | 2018-03-01 | 8 | -0/+423 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline variables expressions See merge request gitlab-org/gitlab-ce!17261 | |||||
| * | | | | | | | | | Make max tokens in expressions lexer a class-level attribute | Grzegorz Bizon | 2018-03-01 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Improve pipeline expressions lexer | Grzegorz Bizon | 2018-03-01 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Do not use keyword args to pass expression variables | Grzegorz Bizon | 2018-02-27 | 1 | -0/+7 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Improve specs for pipeline expression statement | Grzegorz Bizon | 2018-02-27 | 1 | -4/+5 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add support for single quoted string in pipeline expressions | Grzegorz Bizon | 2018-02-27 | 2 | -0/+63 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af' into ↵ | Grzegorz Bizon | 2018-02-23 | 27 | -376/+1036 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/pipeline-variable-expressions * commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af': (247 commits) | |||||
| * | | | | | | | | | Add missing specs for pipeline expression lexemes | Grzegorz Bizon | 2018-02-23 | 5 | -1/+129 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Adds specs for pipeline expressions raw token | Grzegorz Bizon | 2018-02-23 | 1 | -0/+45 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add support for evaluating pipeline expression variables | Grzegorz Bizon | 2018-02-23 | 1 | -0/+20 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add operator / value types in pipeline expressions | Grzegorz Bizon | 2018-02-23 | 1 | -5/+14 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Move pipeline expression lexemes to a separate module | Grzegorz Bizon | 2018-02-23 | 3 | -5/+5 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Simplify pipelines expression parser | Grzegorz Bizon | 2018-02-23 | 2 | -7/+9 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Build a recursive parser for pipeline expressions | Grzegorz Bizon | 2018-02-22 | 1 | -0/+17 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Extract pipeline expressions parser to a separate class | Grzegorz Bizon | 2018-02-22 | 3 | -24/+27 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Rename pipeline expressions statement exception class | Grzegorz Bizon | 2018-02-22 | 1 | -1/+12 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add variables to pipeline expressions evaluator | Grzegorz Bizon | 2018-02-21 | 1 | -0/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Improve pipeline expressions specs and freeze constants | Grzegorz Bizon | 2018-02-21 | 1 | -4/+15 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Implement pipeline expressions parser | Grzegorz Bizon | 2018-02-21 | 2 | -0/+45 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add test example for syntax error in pipeline expressions | Grzegorz Bizon | 2018-02-21 | 1 | -0/+7 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add a lexeme for a string pipeline expression | Grzegorz Bizon | 2018-02-21 | 1 | -0/+16 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Implement pipeline expressions lexer | Grzegorz Bizon | 2018-02-21 | 1 | -0/+30 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Rename pipeline expressions token for checking equality | Grzegorz Bizon | 2018-02-21 | 1 | -0/+0 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add base classes to evaluate variables expressions | Grzegorz Bizon | 2018-02-20 | 2 | -0/+4 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'zj-gitaly-encoding-issue' into 'master' | Robert Speicher | 2018-03-01 | 1 | -51/+67 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode revision for gitattributes ref Closes gitaly#1032 and #43278 See merge request gitlab-org/gitlab-ce!17291 | |||||
| * | | | | | | | | | Encode revision for gitattributes ref | Zeger-Jan van de Weg | 2018-03-01 | 1 | -51/+67 | |
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Coutable | 2018-03-01 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Projects hooks : confidential_issues_events" Closes #43425 See merge request gitlab-org/gitlab-ce!17370 | |||||
| * | | | | | | | | | align "confidential issues events" implementation with "issues events" one | Jean-Baptiste Guerraz | 2018-03-01 | 1 | -0/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'dz-system-hooks-plugins' into 'master' | Douwe Maan | 2018-03-01 | 1 | -0/+68 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to use external plugins as system hooks See merge request gitlab-org/gitlab-ce!17003 | |||||
| * | | | | | | | | Refactor plugins feature and make some doc improvements | Dmitriy Zaporozhets | 2018-02-28 | 1 | -6/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | | | | | | | Refactor plugin execution method | Dmitriy Zaporozhets | 2018-02-27 | 1 | -14/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | | | | | | | Few code improvements for spec/lib/gitlab/plugin_spec.rb | Dmitriy Zaporozhets | 2018-02-27 | 1 | -7/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | | | | | | | Add specs for Gitlab::Plugin [ci skip] | Dmitriy Zaporozhets | 2018-02-26 | 1 | -0/+39 | |
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | | | | | Fix code search results with non-ASCII data43531-500-error-searching-wiki-incompatible-character-encodings-utf-8-and-ascii-8bit | Sean McGivern | 2018-02-28 | 1 | -0/+27 | |
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Git::Popen#popen now returns ASCII-8BIT (binary) data always, so we need to handle that explicitly. | |||||
* | | | | | | | Merge branch '40502-osw-keep-link-when-redacting-unauthorized-objects' into ↵ | Douwe Maan | 2018-02-27 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 links | Oswaldo Ferreira | 2018-02-27 | 1 | -0/+10 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge branch 'backstage/gb/build-stages-catch-up-migration' into 'master' | Kamil Trzciński | 2018-02-27 | 1 | -0/+54 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-migration | Grzegorz Bizon | 2018-02-23 | 12 | -7/+437 | |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/build-stages-catch-up-migration * commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af': (40 commits) | |||||
| * | | | | | | | Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration' | Grzegorz Bizon | 2018-02-22 | 15 | -369/+599 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb |