summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Revert to old code style where branches of the union do not have extra where ...Greg Stark2018-02-091-18/+12
| * | | | WIP experimentGreg Stark2018-02-091-3/+9
| * | | | Add indexes and change SQL for expired artifacts to deal with artifacts migra...Greg Stark2018-02-081-4/+36
* | | | | Resolve "Remove notification settings for groups and projects you were previo...🙈 jacopo beschi 🙉2018-02-141-1/+1
| |_|/ / |/| | |
* | | | Merge branch '42934-search-api-fix' into 'master'Sean McGivern2018-02-141-0/+4
|\ \ \ \
| * | | | API - Include project in commits&blobs search resultsJarka Kadlecová2018-02-141-0/+4
| | |_|/ | |/| |
* | | | Merge branch '37050-ext-issue-tracker' into 'master'Sean McGivern2018-02-141-0/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Display a link to external issue tracker when enabledJarka Kadlecová2018-02-141-0/+2
* | | | Remove allow_n_plus_1 block from Network::Graphfix/remove-allow-n-plus-1-from-network-graphAhmad Sherif2018-02-131-5/+2
| |/ / |/| |
* | | Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-s...rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-keyRubén Dávila2018-02-121-3/+4
* | | Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'Kamil Trzciński2018-02-091-1/+4
* | | Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibil...Douwe Maan2018-02-091-0/+21
|/ /
* | Merge branch 'feature/oidc-groups-claim' into 'master'Douwe Maan2018-02-081-1/+6
|\ \
| * | Add groups to OpenID Connect claimsHassan Zamani2018-02-081-1/+6
* | | Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitalysh-fix-rebase-in-progress-nplus-oneStan Hu2018-02-081-3/+5
* | | Merge branch '40994-expose-features-as-ci-cd-variable' into 'master'Kamil Trzciński2018-02-082-0/+5
|\ \ \ | |_|/ |/| |
| * | Expose GITLAB_FEATURES as CI/CD variable (fixes #40994)40994-expose-features-as-ci-cd-variableDylan Griffith2018-02-072-0/+5
* | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-073-6/+104
|\ \ \
| * | | Fix order of checks in editable? method.Pawel Chojnacki2018-02-071-3/+4
| * | | Make prometheus service querying approach much nicer wrt to arity and default...Pawel Chojnacki2018-02-071-3/+4
| * | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0630-198/+272
| |\ \ \
| * | | | use find_or_initialize to fetch prometheus_service instancePawel Chojnacki2018-02-061-1/+1
| * | | | remove unnecessary commentPawel Chojnacki2018-02-061-1/+0
| * | | | fix rubocop errors and ensure prometheus_installed? doesn't fail in CI tests ...Mike Greiling2018-01-311-1/+2
| * | | | hide prometheus manual integration form when auto config is activeMike Greiling2018-01-311-10/+8
| * | | | change prometheus service description text to match designMike Greiling2018-01-311-1/+1
| * | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-316-68/+24
| |\ \ \ \
| * | | | | Fix rubocopPawel Chojnacki2018-01-301-0/+1
| * | | | | fix service generic testsPawel Chojnacki2018-01-301-4/+1
| * | | | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-2922-142/+194
| |\ \ \ \ \
| * | | | | | check if service is templatePawel Chojnacki2018-01-171-0/+1
| * | | | | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-1732-172/+349
| |\ \ \ \ \ \
| * | | | | | | Fix rubocop warningsPawel Chojnacki2018-01-041-3/+6