summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0616-145/+425
|\
| * Merge branch 'dm-user-namespace-route-path-validation' into 'master'Sean McGivern2018-02-061-2/+19
| |\
| | * Validate user namespace before saving so that errors persist on modeldm-user-namespace-route-path-validationDouwe Maan2018-02-061-2/+19
| * | Merge branch 'master' into 'zj-wiki-page-versions'Douwe Maan2018-02-0622-214/+575
| |\ \ | | |/
| | * Merge branch 'winh-kubernetes-clusters' into 'master'Phil Hughes2018-02-061-1/+1
| | |\
| | | * Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-061-1/+1
| | * | Merge branch '14256-upload-destroy-removes-file' into 'master'Sean McGivern2018-02-061-0/+12
| | |\ \
| | | * | improvements from feedback14256-upload-destroy-removes-fileMicaël Bergeron2018-02-061-0/+12
| | * | | Merge branch 'feature/sm/artifacts-trace' into 'master'Kamil Trzciński2018-02-062-4/+7
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Refactor :trace to :trace_live in specShinya Maeda2018-02-061-4/+4
| | | * | Finish all testsShinya Maeda2018-02-061-2/+2
| | | * | Add essential testsShinya Maeda2018-02-061-0/+3
| | | |/
| | * | Merge branch '26468-fix-admin-recent-sign-in' into 'master'Rémy Coutable2018-02-061-8/+14
| | |\ \ | | | |/ | | |/|
| | | * Using correct column for sorting users by Recent Sign-inPoornima2018-02-051-8/+14
| | * | 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-063-31/+57
| | * | Merge branch '32282-add-foreign-keys-to-todos' into 'master'Yorick Peterse2018-02-053-2/+3
| | |\ \ | | | |/ | | |/|
| | | * Set todos#author_id to NOT NULL.32282-add-foreign-keys-to-todosAndreas Brandl2018-02-051-0/+1
| | | * Add foreign keys to todos table.Andreas Brandl2018-02-052-2/+2
| | * | Allow moving wiki pages from the UIFrancisco Javier López2018-02-051-4/+116
| | * | Merge branch 'fix/gitaly-wiki-encoding-issues' into 'master'Robert Speicher2018-02-051-1/+12
| | |\ \
| | | * | Encode GitalyClient::WikiPage attributes to UTF-8fix/gitaly-wiki-encoding-issuesAhmad Sherif2018-02-051-1/+12
| | * | | Merge branch '42547-upload-store-mount-point' into 'master'Sean McGivern2018-02-051-0/+6
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | add the uploader context to the upload modelMicaël Bergeron2018-02-021-0/+6
| | * | | Merge branch 'persistent-callouts' into 'master'Kamil Trzciński2018-02-051-0/+16
| | |\ \ \
| | | * | | Change UserCallout feautre_name to enumMatija Čupić2018-02-031-1/+1
| | | * | | Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-0213-123/+158
| | | |\ \ \
| | | * | | | Rename Callout to UserCalloutMatija Čupić2018-02-021-2/+2
| | | * | | | Remove dismissed_state from Callout modelMatija Čupić2018-02-021-1/+8
| | | * | | | Add Callout specsMatija Čupić2018-01-261-0/+9
| | * | | | | Fix export removal for hashed-storage projects within a renamed or deleted na...Nick Thomas2018-02-052-0/+51
| | | |_|_|/ | | |/| | |
| | * | | | Merge branch 'zj-ref-contains' into 'master'Douwe Maan2018-02-041-11/+34
| | |\ \ \ \
| | | * | | | Client changes for Tag,BranchNamesContainingCommitZeger-Jan van de Weg2018-02-011-11/+34
| | * | | | | Merge branch 'fix/remove-duplicated-logic-between-model-and-lib-in-find-branc...Grzegorz Bizon2018-02-031-8/+8
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Remove repo reloading logic from Repository#find_branchfix/remove-duplicated-logic-between-model-and-lib-in-find-branchAhmad Sherif2018-02-021-8/+8
| | * | | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' i...Douwe Maan2018-02-021-7/+44
| | |\ \ \ \ \
| | | * | | | | Sanitize extra blank spaces used when uploading a SSH keyRubén Dávila2018-02-011-7/+44
| | * | | | | | use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-024-14/+2
| | | |_|_|_|/ | | |/| | | |
| | * | | | | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-012-60/+15
| | | |_|/ / | | |/| | |
| | * | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-011-2/+2
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-011-2/+2
| | | |/ /
| * | | | Client implementation for WikiPageVerionZeger-Jan van de Weg2018-01-221-8/+24
* | | | | fix tests for find or initialize service 'prometheus'Pawel Chojnacki2018-02-061-1/+1
* | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-315-10/+55
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'rugged-reference-cache-rescue' into 'master'Sean McGivern2018-01-311-5/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove Rugged exception in cache rescuerugged-reference-cache-rescueJacob Vosmaer2018-01-301-5/+3
| * | | | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-301-5/+15
| |\ \ \ \
| | * | | | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-301-5/+15
| | | |_|/ | | |/| |
| * | | | Merge branch '42160-error-500-loading-merge-request-undefined-method-index-fo...Douwe Maan2018-01-301-0/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix truncated_diff_lines for legacy notes without a line42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclassSean McGivern2018-01-301-0/+10
| * | | | Merge branch 'osw-short-circuit-mergeable-disccusions-state' into 'master'Sean McGivern2018-01-301-0/+4
| |\ \ \ \ | | |/ / / | |/| | |
View Lorry Controller Status