summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-route-path-validation' into 'master'Sean McGivern2018-02-065-21/+17
|\
| * Validate User username only on Namespace, and bubble up appropriatelyDouwe Maan2018-02-061-3/+1
| * Validate path uniqueness only on Route, and bubble up appropriatelyDouwe Maan2018-02-065-19/+17
* | Merge branch 'dm-user-namespace-route-path-validation' into 'master'Sean McGivern2018-02-062-12/+9
|\ \ | |/
| * Validate user namespace before saving so that errors persist on modeldm-user-namespace-route-path-validationDouwe Maan2018-02-062-12/+9
* | Merge branch '42730-close-rugged-repository' into 'master'Douwe Maan2018-02-062-1/+8
|\ \ | |/ |/|
| * Close low level rugged repository in project cache workerBastian Blank2018-02-062-1/+8
* | Merge branch 'winh-kubernetes-clusters' into 'master'Phil Hughes2018-02-062-6/+7
|\ \
| * | Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-062-6/+7
* | | Merge branch '14256-upload-destroy-removes-file' into 'master'Sean McGivern2018-02-061-0/+8
|\ \ \
| * | | improvements from feedback14256-upload-destroy-removes-fileMicaël Bergeron2018-02-061-1/+1
| * | | remove file after `Upload#destroy`Micaël Bergeron2018-02-061-0/+8
* | | | Merge branch 'feature/sm/artifacts-trace' into 'master'Kamil Trzciński2018-02-063-3/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Inlcude the size of trace artifactsShinya Maeda2018-02-061-2/+1
| * | | Trace as artifactsShinya Maeda2018-02-062-1/+5
| |/ /
* | | Merge branch '26468-fix-admin-recent-sign-in' into 'master'Rémy Coutable2018-02-061-2/+2
|\ \ \ | |/ / |/| |
| * | Using correct column for sorting users by Recent Sign-inPoornima2018-02-051-2/+2
| |/
* | 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-062-15/+15
* | 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-052-12/+58
* | Merge branch '42547-upload-store-mount-point' into 'master'Sean McGivern2018-02-051-3/+14
|\ \ | |/ |/|
| * apply fixes from feedback42547-upload-store-mount-pointMicaël Bergeron2018-02-021-2/+1
| * add the uploader context to the upload modelMicaël Bergeron2018-02-021-3/+15
* | Merge branch 'persistent-callouts' into 'master'Kamil Trzciński2018-02-052-0/+14
|\ \
| * | Bump UserCallout feature_name enum indexMatija Čupić2018-02-051-1/+1
| * | Change UserCallout feautre_name to enumMatija Čupić2018-02-031-1/+8
| * | Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-0226-191/+131
| |\ \
| * | | Rename Callout to UserCalloutMatija Čupić2018-02-022-2/+2
| * | | Remove dismissed_state from Callout modelMatija Čupić2018-02-021-0/+3
| * | | Merge branch 'master' into persistent-calloutsMatija Čupić2018-01-275-3/+12
| |\ \ \
| * | | | Add Callout modelMatija Čupić2018-01-262-0/+4
* | | | | Enable Prometheus metrics for deployed IngressesJoshua Lambert2018-02-051-1/+5
* | | | | Fix export removal for hashed-storage projects within a renamed or deleted na...Nick Thomas2018-02-054-21/+27
* | | | | Merge branch 'zj-ref-contains' into 'master'Douwe Maan2018-02-041-2/+2
|\ \ \ \ \
| * | | | | Client changes for Tag,BranchNamesContainingCommitZeger-Jan van de Weg2018-02-011-2/+2
* | | | | | Merge branch 'fix/remove-duplicated-logic-between-model-and-lib-in-find-branc...Grzegorz Bizon2018-02-031-9/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove repo reloading logic from Repository#find_branchfix/remove-duplicated-logic-between-model-and-lib-in-find-branchAhmad Sherif2018-02-021-9/+1
* | | | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' i...Douwe Maan2018-02-021-4/+3
|\ \ \ \ \ \
| * | | | | | Sanitize extra blank spaces used when uploading a SSH keyRubén Dávila2018-02-011-4/+3
* | | | | | | use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-0210-39/+24
| |_|_|_|_|/ |/| | | | |
* | | | | | fix specsMicaël Bergeron2018-02-012-2/+1
* | | | | | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-017-59/+60
| |_|/ / / |/| | | |
* | | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-019-13/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-019-13/+13
* | | | | Merge branch 'rugged-reference-cache-rescue' into 'master'Sean McGivern2018-01-311-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove Rugged exception in cache rescuerugged-reference-cache-rescueJacob Vosmaer2018-01-301-1/+1
* | | | | Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master'Grzegorz Bizon2018-01-311-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-gitAhmad Sherif2018-01-301-19/+1
View Lorry Controller Status