summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Enable Rubocop cops for invalid access modifiersrubocop/enable-access-modifiers-copsGrzegorz Bizon2016-07-191-1/+1
* Fix some useless access modifiers in the codeGrzegorz Bizon2016-07-191-14/+14
* Squashed - fix encoding issuefix/import-export-encodingJames Lopez2016-07-191-0/+9
* Fix of 'Commits being passed to custom hooks are already reachable when using...Valery Sizov2016-07-191-44/+28
* Merge branch 'issue_13343' into 'master' Robert Speicher2016-07-182-0/+36
|\
| * Allow build email service to be testedissue_13343Felipe Artur2016-07-152-0/+36
* | Merge branch '19420-render-only-commit-title' into 'master' 19889-shortcuts-modal-is-brokenDouwe Maan2016-07-181-0/+4
|\ \
| * | add git-commit-title-method into pipeline model and modify viewubudzisz2016-07-181-0/+4
* | | Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-183-7/+19
|\ \ \
| * | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-183-7/+19
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into store-variables...store-variables-and-when-in-builds-tableKamil Trzcinski2016-07-1811-23/+31
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'track-pipeline-user' into 'master' Rémy Coutable2016-07-183-2/+5
| |\ \ \
| | * | | Track a user who created a pipelineKamil Trzcinski2016-07-153-2/+5
| * | | | Merge branch 'fix-deployment-creation-on-build-retry' into 'master' Rémy Coutable2016-07-181-0/+1
| |\ \ \ \
| | * | | | Fix creation of deployment on build that is retried, redeployed or rollbackfix-deployment-creation-on-build-retryKamil Trzcinski2016-07-161-0/+1
| * | | | | Merge branch 'allow-to-pull-public-images' into 'master' Rémy Coutable2016-07-181-1/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Allow to access Container Registry for Public and Internal projectsallow-to-pull-public-imagesKamil Trzcinski2016-07-151-1/+2
| | | |/ / | | |/| |
| * | | | Merge branch 'allow-blank-import-url' into 'master' Rémy Coutable2016-07-181-2/+2
| |\ \ \ \
| | * | | | use method in validates statementJames Lopez2016-07-181-1/+1
| | * | | | Allow a project import URL to be blank to prevent false positivesStan Hu2016-07-171-2/+2
| | | |/ / | | |/| |
| * | | | Merge branch 'normalize_emoji_aliases_paths' into 'master' Rémy Coutable2016-07-182-4/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix not normalized emoji pathsdixpac2016-07-142-4/+8
| * | | | Merge branch 'legacy-diff-notes-are-dumb' into 'master' Douwe Maan2016-07-151-2/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Don't fail when a LegacyDiffNote didn't store the right diffDouwe Maan2016-07-151-2/+2
| * | | | Don't fail when Ci::Pipeline doesn't have a projectDouwe Maan2016-07-151-0/+2
| |/ / /
| * | | Merge branch 'fix-mentioned-users-on-diff-notes' into 'master' Douwe Maan2016-07-152-6/+9
| |\ \ \
| | * | | Use cattr_accessor instead duplicating code on NoteOnDiff concernDouglas Barbosa Alexandre2016-07-153-9/+9
| | * | | Fix mentioned users list on diff notesDouglas Barbosa Alexandre2016-07-151-0/+3
| | | |/ | | |/|
| * | | Merge branch 'revert-lock-for-issuable' into 'master' Robert Speicher2016-07-151-6/+0
| |\ \ \ | | |/ / | |/| |
| | * | Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuableStan Hu2016-07-131-6/+0
| | |/
* | | Store when and yaml variables in builds tableKamil Trzcinski2016-07-161-25/+9
|/ /
* | Merge branch 'fix/persistent-import-data' into 'master' Fatih Acet2016-07-141-2/+8
|\ \ | |/ |/|
| * updated create_or_update_import_data to use guard clauseJames Lopez2016-07-131-1/+3
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/persistent-...James Lopez2016-07-136-13/+33
| |\
| * | fix more specsJames Lopez2016-07-131-1/+5
| * | fix specsJames Lopez2016-07-131-1/+1
| * | fixes a few issues to do with import_url not being saved correctly for import...James Lopez2016-07-121-2/+2
* | | Merge branch 'fix-label-reference-filter' into 'master' Robert Speicher2016-07-131-3/+6
|\ \ \
| * | | Simplify regex for string-based multi-word label surrounded in quotesfix-label-reference-filterDouglas Barbosa Alexandre2016-07-131-1/+1
| * | | Doesn't match empty label references surrounded in quotesDouglas Barbosa Alexandre2016-07-131-1/+1
| * | | Fix markdown rendering for label references that contains `.`Douglas Barbosa Alexandre2016-07-131-2/+2
| * | | Fix markdown rendering for label references that begin with a digitDouglas Barbosa Alexandre2016-07-131-1/+4
| * | | Fix markdown rendering for consecutive label referencesDouglas Barbosa Alexandre2016-07-131-1/+1
| | |/ | |/|
* | | Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-133-19/+7
|/ /
* | Don't ask the user to "merge this request manually".Timothy Andrew2016-07-131-0/+5
* | Refactor `Gitlab::GitAccess`Timothy Andrew2016-07-131-1/+1
* | Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-131-6/+8
* | Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-132-1/+6
* | Merge branch '19693-emoji-awards-aren-t-deleted-for-deleted-users' into 'mast...Douwe Maan2016-07-121-1/+1
|\ \
| * | Delete award emoji when deleting a user19693-emoji-awards-aren-t-deleted-for-deleted-usersSean McGivern2016-07-121-1/+1