Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Fix displaying public projectsfix-public-projects | Kamil Trzcinski | 2015-09-16 | 1 | -5/+0 | |
* | | | | | | | Merge branch 'restrict-user-api-integers' into 'master' | Dmitriy Zaporozhets | 2015-09-17 | 3 | -1/+58 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Restrict users API endpoints to use integer IDs | Stan Hu | 2015-08-23 | 3 | -1/+58 | |
* | | | | | | | | Merge branch 'fix-gh-issue-9640' into 'master' | Dmitriy Zaporozhets | 2015-09-17 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix HTML link that was improperly escaped in new user e-mail | Stan Hu | 2015-09-16 | 2 | -1/+2 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'update-mailroom' into 'master' | Robert Speicher | 2015-09-16 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix Gemfile.lock | Douwe Maan | 2015-09-16 | 1 | -1/+1 | |
| * | | | | | | Merge branch 'master' into update-mailroom | Douwe Maan | 2015-09-16 | 351 | -460/+16498 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Update mail_room | Douwe Maan | 2015-09-16 | 2 | -3/+6 | |
* | | | | | | | | Merge branch 'fix-nginx' into 'master' | Kamil Trzciński | 2015-09-16 | 2 | -0/+24 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Add missing proxy requests to migration docsfix-nginx | Kamil Trzcinski | 2015-09-16 | 2 | -0/+24 | |
* | | | | | | | | Merge branch 'rs-install-guide' into 'master' | Robert Speicher | 2015-09-16 | 2 | -6/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | sudo user is git, not gitlab, not gitlab_ci | Robert Speicher | 2015-09-16 | 1 | -2/+2 | |
| * | | | | | | | | Change 7-14-stable to 8-0-stable in doc/install/installation.md | Robert Speicher | 2015-09-16 | 1 | -4/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'rs-fix-update-guide' into 'master' | Robert Speicher | 2015-09-16 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | sudo user is gitlab, not gitlab_ci | Robert Speicher | 2015-09-16 | 1 | -2/+2 | |
| * | | | | | | | | Add missing code fence closure | Robert Speicher | 2015-09-16 | 1 | -0/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'fix-ci-nav' into 'master' | Dmitriy Zaporozhets | 2015-09-16 | 5 | -10/+4 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Fix confusing behaviour of back link in CI sidebar | Dmitriy Zaporozhets | 2015-09-16 | 5 | -10/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'style-ci-page' into 'master' | Dmitriy Zaporozhets | 2015-09-16 | 4 | -21/+56 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Style CI projects page and builds list | Dmitriy Zaporozhets | 2015-09-16 | 4 | -21/+56 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'fix-issue-2555' into 'master' | Dmitriy Zaporozhets | 2015-09-16 | 3 | -3/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Eliminate combined image_tag and image_path in providers list | Stan Hu | 2015-09-16 | 1 | -1/+1 | |
| * | | | | | | | Fix default avatars to ensure that helpers don't have /assets dir appended | Stan Hu | 2015-09-16 | 2 | -2/+2 | |
* | | | | | | | | Merge branch 'ldap-attributes' into 'master' | Robert Speicher | 2015-09-16 | 12 | -17/+167 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Make code clearerldap-attributes | Douwe Maan | 2015-09-16 | 1 | -11/+9 | |
| * | | | | | | | Add to changelog | Douwe Maan | 2015-09-09 | 1 | -0/+1 | |
| * | | | | | | | Add to docs | Douwe Maan | 2015-09-09 | 2 | -2/+22 | |
| * | | | | | | | Test overriding LDAP attributes | Douwe Maan | 2015-09-09 | 1 | -0/+65 | |
| * | | | | | | | Shuffle config around a bit | Douwe Maan | 2015-09-09 | 3 | -15/+9 | |
| * | | | | | | | Expand explanation in config file | Douwe Maan | 2015-09-09 | 1 | -15/+20 | |
| * | | | | | | | Add attributes to LDAP::Config. | Douwe Maan | 2015-09-08 | 4 | -4/+10 | |
| * | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. | Douwe Maan | 2015-09-08 | 6 | -15/+76 | |
* | | | | | | | | Merge branch 'add-links-to-ci' into 'master' | Dmitriy Zaporozhets | 2015-09-16 | 3 | -0/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add links from GitLab to CI | Dmitriy Zaporozhets | 2015-09-16 | 3 | -0/+10 | |
* | | | | | | | | | Merge branch 'fix-gitlab-ci-in-ce' into 'master' | Dmitriy Zaporozhets | 2015-09-16 | 8 | -4/+31 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Make rubocop happy | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 | |
| * | | | | | | | | Fix CI tests | Kamil Trzcinski | 2015-09-16 | 2 | -3/+3 | |
| * | | | | | | | | Fix ordering issue | Kamil Trzcinski | 2015-09-16 | 4 | -2/+26 | |
| * | | | | | | | | Fix skipped svg | Kamil Trzcinski | 2015-09-16 | 1 | -0/+1 | |
| * | | | | | | | | Fix update_runner_info helper | Kamil Trzcinski | 2015-09-16 | 1 | -0/+2 | |
| * | | | | | | | | Fix migrate tags statement | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 | |
| * | | | | | | | | Fix projects edit | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'markdown_help_fix' into 'master' | Robert Schilling | 2015-09-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix in Markdown help page: properly create the link to a wiki page. | Nicolas Bigaouette | 2015-09-16 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Fix gemfile.lock | Dmitriy Zaporozhets | 2015-09-16 | 1 | -1/+4 | |
| |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' into 'master' | Kamil Trzciński | 2015-09-16 | 346 | -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-g | Kamil Trzcinski | 2015-09-16 | 8 | -48/+385 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge branch 'fix-api-mr-sort' into 'master' | Dmitriy Zaporozhets | 2015-09-16 | 3 | -13/+15 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix broken sort in merge request API | Stan Hu | 2015-09-15 | 3 | -13/+15 | |
| | |_|/ / / / | |/| | | | | |