summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-041-0/+127
* Add test checking if prometheus integration is enabled after prometheus is in...Pawel Chojnacki2018-01-041-0/+18
* Fix links to old commits in merge requests41492-mr-comment-fixJarka Kadlecová2017-12-291-6/+42
* Merge branch '36782-replace-team-user-role-with-add_role-user-in-specs' into ...Rémy Coutable2017-12-2321-64/+64
|\
| * Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-2221-64/+64
* | Merge branch 'dm-diff-note-for-line-performance' into 'master'Robert Speicher2017-12-221-16/+0
|\ \
| * | Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_...Douwe Maan2017-12-221-16/+0
| |/
* | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-224-110/+30
|/
* LDAP extern_uids are not normalized when updated via APIFrancisco Javier López2017-12-211-0/+27
* Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"revert-b655a4a7Kim Carlbäcker2017-12-202-20/+2
* Call the correct method in the BlocksJsonSerialization specrs-blocks-json-serializationRobert Speicher2017-12-191-1/+1
* Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-192-4/+4
* Add a JsonSerializationError class instead of raising SecurityErrorRobert Speicher2017-12-191-2/+2
* Add BlocksJsonSerialization model concern and include it in UserRobert Speicher2017-12-192-0/+18
* Merge branch '36020-private-npm-modules' into 'master'Douwe Maan2017-12-191-0/+47
|\
| * BlobViewer::PackageJson - if private link to homepageMario de la Ossa2017-12-181-3/+4
| * Do not generate links for private NPM modules in blob viewMario de la Ossa2017-12-181-0/+46
* | Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher2017-12-192-0/+87
|\ \ | |/ |/|
| * Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-192-0/+87
* | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-181-0/+9
|\ \ | |/ |/|
| * Avoid Gitaly N+1 calls by caching tag_namesStan Hu2017-12-121-0/+9
* | Fixes 40842 - Adds extra cookies to JIRA service requestsStanislaw Wozniak2017-12-181-0/+20
* | Fix job count in pipeline success mailChristiaan Van den Poel2017-12-181-0/+12
* | Merge branch 'rc/use-factory_bot_rails' into 'master'Robert Speicher2017-12-154-22/+22
|\ \
| * | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_railsRémy Coutable2017-12-144-22/+22
* | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-141-2/+2
|\ \ \ | |/ / |/| |
| * | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-131-2/+2
* | | sorting for tags apihaseeb2017-12-141-2/+8
* | | Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-141-9/+20
|\ \ \
| * | | Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-141-9/+20
| | |/ | |/|
* | | Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual'...Kamil Trzciński2017-12-141-4/+3
|\ \ \
| * | | Dependencies Validator fails when depended job is `manual`41110-dependencies-validator-fails-when-depended-job-is-manualShinya Maeda2017-12-141-4/+3
* | | | Make discussion mail References all notes in the discussiontc-correct-email-in-reply-toToon Claes2017-12-131-11/+8
* | | | Make mail notifications of discussion notes In-Reply-To of each otherToon Claes2017-12-131-0/+25
|/ / /
* | | Merge branch '13695-order-contributors-in-api' into 'master'Rémy Coutable2017-12-131-0/+107
|\ \ \
| * | | Adds ordering to projects contributors in APIJacopo2017-12-131-0/+107
* | | | Merge branch 'issue_41021' into 'master'Sean McGivern2017-12-131-0/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | Prevent worker that updates merge requests head pipeline from failing jobsFelipe Artur2017-12-131-0/+16
| |/ /
* | | Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-121-1/+3
|\ \ \
| * | | Use memoization for commits on diffsZeger-Jan van de Weg2017-12-121-1/+3
| | |/ | |/|
* | | Merge branch 'repo-write-ref-client-prep' into 'master'Robert Speicher2017-12-122-2/+20
|\ \ \
| * | | Move Repository#write_ref to Git::Repository#write_refrepo-write-ref-client-prepKim "BKC" Carlbäcker2017-12-122-2/+20
| |/ /
* | | Merge branch 'optimize-issues-avoid-noop-empty-cache-updates2' into 'master'Sean McGivern2017-12-121-0/+20
|\ \ \
| * | | Treat empty markdown and html strings as valid cached text, not missing cache...optimize-issues-avoid-noop-empty-cache-updates2Greg Stark2017-12-121-0/+20
* | | | Merge branch 'rc/backport-ee-fix' into 'master'Kamil Trzciński2017-12-121-18/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Backport a spec fix done in EE (5dbecb8e) to CERémy Coutable2017-12-111-18/+8
| | |/ | |/|
* | | Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'Douwe Maan2017-12-081-28/+7
|/ /
* | Allow git pull/push on project redirectsMayra Cabrera2017-12-083-0/+158
* | Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-082-17/+6
* | Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'Grzegorz Bizon2017-12-081-0/+25
|\ \
View Lorry Controller Status