summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-235-3/+47
|\
| * Port `read_cross_project` ability from EEBob Van Landuyt2018-02-225-3/+47
* | Merge branch '42431-add-auto-devops-and-clusters-button-to-projects' into 'ma...Rémy Coutable2018-02-221-0/+1
|\ \
| * | Move can_current_user_push_to_branch to PresenterOswaldo Ferreira2018-02-221-6/+0
| * | Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projectsEric Eastwood2018-02-2215-39/+87
| |\ \ | | |/
| * | Move button list logic to project presenterOswaldo Ferreira2018-02-201-0/+7
* | | Merge branch '43373-fix-cache-index-appending' into 'master'Kamil Trzciński2018-02-221-1/+1
|\ \ \ | |_|/ |/| |
| * | Change cache index delimiter to character not recognizable as variable partTomasz Maczukin2018-02-211-1/+1
* | | Merge branch '43134-reduce-queries-pipelines-controller-show' into 'master'Grzegorz Bizon2018-02-221-1/+1
|\ \ \
| * | | Add inverse_of pipeline -> statuses -> pipeline (#43134)43134-reduce-queries-pipelines-controller-showDylan Griffith2018-02-221-1/+1
| |/ /
* | | #28481: Display time tracking totals on milestone pageRiccardo Padovani2018-02-211-0/+8
* | | Merge branch '26039-Update-to-github-linguist5.3.x' into 'master'Robert Speicher2018-02-211-1/+1
|\ \ \
| * | | 26039 - update github-linguist to 5.3.3 versionKen2018-02-211-1/+1
| |/ /
* | | Rename use_conditions_only option to use_where_in.42877-snippets-dashboard-slowAndreas Brandl2018-02-201-3/+3
* | | Avoid manual SQL for visibility level check.Andreas Brandl2018-02-201-1/+1
* | | Cleanup access level shortcut.Andreas Brandl2018-02-201-22/+17
* | | Allow choice between #where or #from.Andreas Brandl2018-02-201-3/+11
* | | Don't mess with table aliases.Andreas Brandl2018-02-201-4/+4
* | | Remove duplication in Project methods.Andreas Brandl2018-02-201-37/+17
* | | Push feature-related query part up.Andreas Brandl2018-02-201-0/+29
* | | Shortcut when all levels visible.Andreas Brandl2018-02-201-0/+6
* | | Replace OR clause with UNION.Andreas Brandl2018-02-201-1/+7
|/ /
* | Merge branch 'remove-unnecessary-validate-project' into 'master'Kamil Trzciński2018-02-202-3/+3
|\ \
| * | Remove unecessary validate: true from belongs_to :projectremove-unnecessary-validate-projectDylan Griffith2018-02-202-3/+3
* | | Merge branch '32564-fix-double-system-closing-notes' into 'master'Sean McGivern2018-02-191-4/+4
|\ \ \
| * | | stop ProcessCommitWorker from processing MR merge commitMicaël Bergeron2018-02-161-4/+4
| |/ /
* | | Merge branch 'sh-guard-read-only-user-updates' into 'master'Nick Thomas2018-02-191-0/+2
|\ \ \
| * | | Don't attempt to update user tracked fields if database is in read-onlysh-guard-read-only-user-updatesStan Hu2018-02-171-0/+2
* | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' i...Douwe Maan2018-02-191-4/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Merge branch 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-u...Rubén Dávila2018-02-151-4/+3
* | | | Merge branch 'revert-215dff76' into 'master'Ian Baum2018-02-171-33/+4
|\ \ \ \
| * | | | Revert "Merge branch 'expired-ci-artifacts' into 'master'"Stan Hu2018-02-161-33/+4
| | |/ / | |/| |
* | | | Don't cache a nil repository root ref to prevent caching issuesdm-dont-cache-nil-root-refDouwe Maan2018-02-161-6/+2
|/ / /
* | | Merge branch 'change/strip-whitespace-from-username-input#42637' into 'master'Rémy Coutable2018-02-151-1/+1
|\ \ \
| * | | Strip whitespace from username/login value for user lookupPeter Lauck2018-02-131-1/+1
* | | | Merge branch 'sh-fix-error-500-licensee' into 'master'Douwe Maan2018-02-151-1/+9
|\ \ \ \
| * | | | Remove head_commit callsh-fix-error-500-licenseeStan Hu2018-02-141-1/+0
| * | | | Simplify license generator error handlingStan Hu2018-02-141-1/+1
| * | | | Remove use of catching Rugged exceptionsStan Hu2018-02-141-1/+4
| * | | | Fix Error 500s loading repositories with no master branchStan Hu2018-02-141-1/+7
| | |/ / | |/| |
* | | | Fixed user synced attributes metadata after removing current providerFrancisco Javier López2018-02-151-0/+9
* | | | Merge branch 'mc/fix/project-variables-scope' into 'master'Kamil Trzciński2018-02-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Validate project variables by scopeMatija Čupić2018-02-131-1/+1
| |/ /
* | | Merge branch '43240-external-tracker-issues-don-t-have-the-correct-closing-te...Rémy Coutable2018-02-141-1/+1
|\ \ \
| * | | Fix closing issues text added to MRs for external issue trackersSean McGivern2018-02-141-1/+1
* | | | Merge branch '38135-remove-ignore-column-from-events' into 'master'Yorick Peterse2018-02-141-4/+0
|\ \ \ \
| * | | | Remove ignore_column from Events#data.38135-remove-ignore-column-from-eventsAndreas Brandl2018-02-131-4/+0
| | |_|/ | |/| |
* | | | Merge branch 'expired-ci-artifacts' into 'master'Grzegorz Bizon2018-02-141-4/+33
|\ \ \ \
| * | | | revert to earlier coding using a hard coded UNION ALL instead of Gitlab::SQL:...expired-ci-artifactsGreg Stark2018-02-091-6/+3
| * | | | add rubocop whitelistGreg Stark2018-02-091-3/+3