summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-webpack-dev-server-proxy' into 'master' Douwe Maan2017-02-271-1/+1
|\
| * fix missing @ symbolMike Greiling2017-02-271-1/+1
* | Merge branch 'fix-webpack-dev-server-proxy' into 'master' Douwe Maan2017-02-271-6/+6
|\ \ | |/
| * ensure webpack dev server proxy connects regardless of request headersfix-webpack-dev-server-proxyMike Greiling2017-02-271-6/+6
* | Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' Robert Speicher2017-02-251-18/+24
|\ \
| * | Optimize a bit Gitlab::Git::Repository#log_by_shell and its specs23062-allow-git-log-to-accept-follow-and-skipRémy Coutable2017-02-231-11/+11
| * | Make Git history follow renames again by performing the --skip in RubyRémy Coutable2017-02-231-9/+15
* | | Raise error when no content is providedDouwe Maan2017-02-241-2/+0
* | | Address reviewDouwe Maan2017-02-241-15/+21
* | | Fix new offensesDouwe Maan2017-02-241-3/+1
* | | Consistently create, update, and delete files, taking CRLF settings into accountDouwe Maan2017-02-243-208/+124
| |/ |/|
* | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-232-6/+7
|/
* Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-2352-167/+148
|\
| * Stylistic tweaksDouwe Maan2017-02-233-12/+7
| * Fix OAuth/SAML user blocking behaviorDouwe Maan2017-02-231-1/+3
| * Revert "Enable Style/DotPosition"Douwe Maan2017-02-2312-47/+47
| * Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-2326-124/+124
| * Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-231-2/+2
| * Move up delegate callsDouwe Maan2017-02-231-2/+2
| * ActiveSupport delegation is preferred over ForwardableDouwe Maan2017-02-231-2/+0
| * Update rubocop and rubocop-rspec and regenerate .rubocop_todo.ymlDouwe Maan2017-02-232-7/+4
| * Don’t exclude some file in lib from rubocopDouwe Maan2017-02-232-6/+6
| * Fix new offensesDouwe Maan2017-02-232-2/+2
| * Enable Rails/DelegateDouwe Maan2017-02-239-37/+13
| * Enable Style/WordArrayDouwe Maan2017-02-232-2/+2
| * Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-231-2/+4
| * Enable Style/MultilineArrayBraceLayoutDouwe Maan2017-02-231-12/+13
| * Enable Style/EmptyLineBetweenDefsDouwe Maan2017-02-231-0/+1
| * Enable Style/ClassCheckDouwe Maan2017-02-231-1/+1
| * Prefer leading style for Style/DotPositionDouwe Maan2017-02-2326-122/+122
| * Fix code for copsDouwe Maan2017-02-2311-52/+61
| * Enable Style/ConditionalAssignmentDouwe Maan2017-02-238-27/+27
| * Enable Style/ColonMethodCallDouwe Maan2017-02-232-2/+2
| * Enable Style/BarePercentLiteralsDouwe Maan2017-02-231-2/+2
| * Enable Performance/RedundantMatchDouwe Maan2017-02-232-2/+2
| * Enable Performance/RedundantBlockCallDouwe Maan2017-02-232-2/+2
| * Enable Performance/RedundantMergeDouwe Maan2017-02-231-1/+1
| * Enable Style/MutableConstantDouwe Maan2017-02-2322-35/+35
| * Enable Style/DotPositionDouwe Maan2017-02-2312-45/+45
* | Merge branch 'fix/gb/pipeline-retry-skipped-jobs' into 'master' Kamil Trzciński2017-02-231-1/+3
|\ \ | |/ |/|
| * Fix Rubocop offense in OptimisticLocking modulefix/gb/pipeline-retry-skipped-jobsGrzegorz Bizon2017-02-231-1/+1
| * Process skipped jobs in the pipeline when retrying itGrzegorz Bizon2017-02-231-1/+3
* | Merge branch 'improve-ee_compat_check-by-using-git-apply-3way-flag' into 'mas...Robert Speicher2017-02-221-1/+1
|\ \
| * | Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag improve-ee_compat_check-by-using-git-apply-3way-flagRémy Coutable2017-02-221-1/+1
* | | Merge branch 'connection-pool-host' into 'master'Rémy Coutable2017-02-221-1/+6
|\ \ \ | |/ / |/| |
| * | Allow setting of a custom connection pool hostYorick Peterse2017-02-221-1/+6
* | | Merge branch 'zj-fix-slash-command-labels' into 'master' Douwe Maan2017-02-221-1/+1
|\ \ \ | |/ / |/| |
| * | Chat slash commands show labels correctlyzj-fix-slash-command-labelsZ.J. van de Weg2017-02-211-1/+1
* | | Merge branch '26087-asciidoc-cicd-badges-snippet' into 'master'Rémy Coutable2017-02-221-0/+4
|\ \ \ | |_|/ |/| |
| * | Add AsciiDoc snippet for CI/CD BadgesJan Christophersen2017-02-201-0/+4