summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Minor code cleanupnotification-levelsDouwe Maan2015-09-203-24/+23
* Use the `find_by_user_id` magic finder instead of `where`.Patricio Cano2015-09-161-1/+1
* Updated label from `Mention` to `On Mention`.Patricio Cano2015-09-161-1/+1
* Merge branch 'master' into notification-levelsPatricio Cano2015-09-16389-571/+17165
|\
| * Merge branch 'fix-nginx' into 'master'Kamil Trzciński2015-09-162-0/+24
| |\
| | * Add missing proxy requests to migration docsfix-nginxKamil Trzcinski2015-09-162-0/+24
| * | Merge branch 'rs-install-guide' into 'master'Robert Speicher2015-09-162-6/+6
| |\ \
| | * | sudo user is git, not gitlab, not gitlab_ciRobert Speicher2015-09-161-2/+2
| | * | Change 7-14-stable to 8-0-stable in doc/install/installation.mdRobert Speicher2015-09-161-4/+4
| |/ /
| * | Merge branch 'rs-fix-update-guide' into 'master'Robert Speicher2015-09-161-2/+3
| |\ \
| | * | sudo user is gitlab, not gitlab_ciRobert Speicher2015-09-161-2/+2
| | * | Add missing code fence closureRobert Speicher2015-09-161-0/+1
| |/ /
| * | Merge branch 'fix-ci-nav' into 'master'Dmitriy Zaporozhets2015-09-165-10/+4
| |\ \
| | * | Fix confusing behaviour of back link in CI sidebarDmitriy Zaporozhets2015-09-165-10/+4
| | |/
| * | Merge branch 'style-ci-page' into 'master'Dmitriy Zaporozhets2015-09-164-21/+56
| |\ \
| | * | Style CI projects page and builds listDmitriy Zaporozhets2015-09-164-21/+56
| | |/
| * | Merge branch 'fix-issue-2555' into 'master'Dmitriy Zaporozhets2015-09-163-3/+3
| |\ \
| | * | Eliminate combined image_tag and image_path in providers listStan Hu2015-09-161-1/+1
| | * | Fix default avatars to ensure that helpers don't have /assets dir appendedStan Hu2015-09-162-2/+2
| * | | Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-1612-17/+167
| |\ \ \ | | |_|/ | |/| |
| | * | Make code clearerldap-attributesDouwe Maan2015-09-161-11/+9
| | * | Add to changelogDouwe Maan2015-09-091-0/+1
| | * | Add to docsDouwe Maan2015-09-092-2/+22
| | * | Test overriding LDAP attributesDouwe Maan2015-09-091-0/+65
| | * | Shuffle config around a bitDouwe Maan2015-09-093-15/+9
| | * | Expand explanation in config fileDouwe Maan2015-09-091-15/+20
| | * | Add attributes to LDAP::Config.Douwe Maan2015-09-084-4/+10
| | * | Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-086-15/+76
| * | | Merge branch 'add-links-to-ci' into 'master'Dmitriy Zaporozhets2015-09-163-0/+10
| |\ \ \
| | * | | Add links from GitLab to CIDmitriy Zaporozhets2015-09-163-0/+10
| * | | | Merge branch 'fix-gitlab-ci-in-ce' into 'master'Dmitriy Zaporozhets2015-09-168-4/+31
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make rubocop happyKamil Trzcinski2015-09-161-1/+1
| | * | | Fix CI testsKamil Trzcinski2015-09-162-3/+3
| | * | | Fix ordering issueKamil Trzcinski2015-09-164-2/+26
| | * | | Fix skipped svgKamil Trzcinski2015-09-161-0/+1
| | * | | Fix update_runner_info helperKamil Trzcinski2015-09-161-0/+2
| | * | | Fix migrate tags statementKamil Trzcinski2015-09-161-1/+1
| | * | | Fix projects editKamil Trzcinski2015-09-161-1/+1
| * | | | Merge branch 'markdown_help_fix' into 'master'Robert Schilling2015-09-161-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix in Markdown help page: properly create the link to a wiki page.Nicolas Bigaouette2015-09-161-1/+1
| |/ / /
| * | | Fix gemfile.lockDmitriy Zaporozhets2015-09-161-1/+4
| * | | Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' into 'master'Kamil Trzciński2015-09-16346-416/+16119
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gKamil Trzcinski2015-09-168-48/+385
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'fix-api-mr-sort' into 'master'Dmitriy Zaporozhets2015-09-163-13/+15
| |\ \ \
| | * | | Fix broken sort in merge request APIStan Hu2015-09-153-13/+15
| * | | | Merge branch 'reply-by-email-docs' into 'master'Douwe Maan2015-09-162-31/+364
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Tweak textDouwe Maan2015-09-161-5/+5
| | * | | Fix sudo_gitlab helperreply-by-email-docsDouwe Maan2015-09-101-4/+2
| | * | | Move source section below omnibus section.Douwe Maan2015-09-091-31/+31
| | * | | Restructure omnibus instructions to match those for source installations.Douwe Maan2015-09-091-22/+26
View Lorry Controller Status