summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
...
* | | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-225-38/+64
* | | Merge branch 'dm-issue-move-transaction-error' into 'master'Robert Speicher2017-12-221-5/+11
|\ \ \ | |/ / |/| |
| * | Execute project hooks and services after commit when moving an issuedm-issue-move-transaction-errorDouwe Maan2017-12-221-5/+11
| |/
* | Use relative URLs when linking to uploaded filesNick Thomas2017-12-221-1/+1
* | Merge branch 'dz-fix-seed-fu' into 'master'Douwe Maan2017-12-221-0/+1
|\ \ | |/ |/|
| * Explictly require Gitlab::Utils in ProjectFeaturesCompatibilitydz-fix-seed-fuDmitriy Zaporozhets2017-12-221-0/+1
* | LDAP extern_uids are not normalized when updated via APIFrancisco Javier López2017-12-211-0/+10
|/
* Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"revert-b655a4a7Kim Carlbäcker2017-12-202-7/+11
* Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-191-1/+1
* Add a JsonSerializationError class instead of raising SecurityErrorRobert Speicher2017-12-191-2/+4
* Accept arguments to blocked JSON serialization methodsRobert Speicher2017-12-191-1/+1
* Add BlocksJsonSerialization model concern and include it in UserRobert Speicher2017-12-192-0/+15
* Merge branch '36020-private-npm-modules' into 'master'Douwe Maan2017-12-192-3/+28
|\
| * BlobViewer::PackageJson - if private link to homepageMario de la Ossa2017-12-181-3/+9
| * Do not generate links for private NPM modules in blob viewMario de la Ossa2017-12-182-3/+22
* | Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher2017-12-193-9/+36
|\ \ | |/ |/|
| * Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-193-9/+36
* | rework the merge_request_version_params to use Object#tapcommit-diff-discussion-in-mr-context-fix-linksMicaël Bergeron2017-12-181-8/+4
* | fix the commit diff discussion sending the wrong urlMicaël Bergeron2017-12-181-5/+14
* | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-181-0/+6
|\ \ | |/ |/|
| * Avoid Gitaly N+1 calls by caching tag_namesStan Hu2017-12-121-0/+6
* | Fixes 40842 - Adds extra cookies to JIRA service requestsStanislaw Wozniak2017-12-181-0/+2
* | Fix job count in pipeline success mailChristiaan Van den Poel2017-12-181-0/+4
* | Merge branch 'no-ivar-in-modules' into 'master'Robert Speicher2017-12-1510-40/+49
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-1543-216/+750
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-3029-262/+293
| |\ \ \
| * | | | Fix a few layout errorLin Jen-Shin2017-11-221-0/+1
| * | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-2223-55/+241
| |\ \ \ \
| * | | | | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-226-21/+21
| * | | | | Updates based on feedbackLin Jen-Shin2017-11-221-4/+1
| * | | | | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-188-34/+33
| * | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-1733-213/+643
| |\ \ \ \ \
| * | | | | | WIPLin Jen-Shin2017-11-061-13/+5
| * | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-0670-354/+1275
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-09-2514-105/+55
| |\ \ \ \ \ \ \
| * | | | | | | | Allow simple ivar ||= form. Update accordinglyLin Jen-Shin2017-09-1912-19/+25
| * | | | | | | | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-1814-2/+17
* | | | | | | | | Merge branch 'dm-ldap-email-readonly' into 'master'Sean McGivern2017-12-153-5/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Make sure user email is read only when synced with LDAPDouwe Maan2017-12-153-5/+11
* | | | | | | | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-141-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-131-1/+1
* | | | | | | | | | Merge branch 'dm-batchloader-project' into 'master'Sean McGivern2017-12-141-3/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Include project in BatchLoader key to prevent returning blobs for the wrong p...Douwe Maan2017-12-141-3/+9
* | | | | | | | | | | sorting for tags apihaseeb2017-12-141-1/+3
* | | | | | | | | | | Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-141-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual'...Kamil Trzciński2017-12-141-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Dependencies Validator fails when depended job is `manual`41110-dependencies-validator-fails-when-depended-job-is-manualShinya Maeda2017-12-141-1/+0
* | | | | | | | | | | Make discussion mail References all notes in the discussiontc-correct-email-in-reply-toToon Claes2017-12-131-4/+5
* | | | | | | | | | | Make mail notifications of discussion notes In-Reply-To of each otherToon Claes2017-12-131-0/+9
|/ / / / / / / / / /