summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cs-cropper' into 'master' Fatih Acet2016-07-081-0/+1
|\
| * Split Cropper.js from the main JavaScript manifest.Connor Shea2016-06-291-0/+1
* | Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-071-1/+1
|\ \
| * | Modify the frontend for wildcard protected branches.Timothy Andrew2016-07-051-1/+1
* | | Instrument Rinku usage18593-autofilter-rinku-instrumentationPaco Guzman2016-07-041-0/+2
|/ /
* | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-012-6/+0
* | Merge branch 'upgrade-sprockets-rails' into 'master' Robert Speicher2016-07-011-0/+3
|\ \
| * | Remove quiet_assets in favor of built-in sprockets-rails config.upgrade-sprockets-railsConnor Shea2016-06-301-0/+3
* | | Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab18592-syntaxhighlighter-slowPaco Guzman2016-07-011-0/+3
|/ /
* | Import from Github using Personal Access Tokens.Eric K Idema2016-06-302-1/+3
* | Merge branch 'rack-request-trusted-proxies' into 'master' Douwe Maan2016-06-301-0/+13
|\ \
| * | Make Rack::Request use our trusted proxies when filtering IP addressesrack-request-trusted-proxiesDJ Mountney2016-06-291-0/+13
* | | Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-301-0/+6
|\ \ \
| * | | Loop all disks when displaying system infoissue-18886Josh Frye2016-06-291-0/+6
* | | | Create (if necessary) and link the gitlab-shell secret file on the rake insta...shardsAlejandro Rodríguez2016-06-291-19/+1
* | | | Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-294-7/+46
| |/ / |/| |
* | | Enable Style/SpaceAfterComma Rubocop coprubocop/enable-space-after-copsGrzegorz Bizon2016-06-292-2/+2
* | | Enable Style/SpaceAfterColon Rubocop copsGrzegorz Bizon2016-06-291-1/+1
|/ /
* | Show basic system info on admin panel. Closes #18886Josh Frye2016-06-281-0/+1
|/
* Merge branch 'js-content-for' into 'master' Jacob Schatz2016-06-241-0/+2
|\
| * Add precompilation for relevant assets.Connor Shea2016-06-231-0/+2
* | Merge branch 'add-smtp-setting' into 'master' Stan Hu2016-06-241-0/+1
|\ \
| * | Add SMTP as default delivery method to match gitlab-org/omnibus-gitlab!826Stan Hu2016-06-241-0/+1
* | | Merge branch 'health-check-disable-email' into 'master' Rémy Coutable2016-06-241-0/+14
|\ \ \ | |/ / |/| |
| * | Set the health_check mailer full checks to be the same as the standard checksDJ Mountney2016-06-241-0/+1
| * | Disable the email checking part of the standard Health Checkhealth-check-disable-emailDJ Mountney2016-06-241-0/+13
| |/
* | Support for rendering/redacting multiple documentsYorick Peterse2016-06-241-0/+4
* | Restrict hamlit version, remove coffeescript filters.Connor Shea2016-06-231-0/+3
* | Replace Haml with Hamlit.connorshea2016-06-222-7/+15
|/
* add missing import sourcefix/import-sourcesJames Lopez2016-06-211-1/+1
* Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-211-1/+1
|\
| * Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-203-3/+31
| |\
| * | Admin::RunnerProjectsController#index is not usedremove-admin-runner-projectsLin Jen-Shin2016-06-171-1/+1
* | | Merge branch 'async-refs-dropdown' into 'master' Jacob Schatz2016-06-201-0/+1
|\ \ \ | |_|/ |/| |
| * | Refs dropdown is now loaded asyncPhil Hughes2016-06-181-0/+1
* | | Avoid autoload issue such as 'Mail::Parsers::AddressStruct'18810-nameerror-uninitialized-constant-mail-parsers-addressstructRémy Coutable2016-06-201-0/+4
|/ /
* | Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-171-2/+8
|\ \
| * \ Merge master into issue_12758issue_12758Felipe Artur2016-06-173-0/+9
| |\ \
| * \ \ Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-171-2/+8
| |\ \ \
| | * | | Re-use notifications dropdown on user profileFelipe Artur2016-06-161-2/+8
* | | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-181-1/+1
|\ \ \ \ \
| * | | | | Removed update methodissuable-todo-improvementsPhil Hughes2016-06-171-1/+1
| * | | | | Improved manual todosPhil Hughes2016-06-171-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-172-0/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | a few changes based on MR feedbackJames Lopez2016-06-171-0/+1
| * | | | fixed merge conflicts on UI branchJames Lopez2016-06-167-14/+48
| |\ \ \ \
| | * \ \ \ fixed merge conflictsJames Lopez2016-06-167-14/+48
| | |\ \ \ \
| * | | | | | lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-151-0/+1
| * | | | | | some refactoring - renaming things, etc..James Lopez2016-06-151-3/+3
| * | | | | | project export archiverJames Lopez2016-06-141-0/+3
View Lorry Controller Status