summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update the link in integration readme.gmail_actions_docMarin Jankovski2015-09-171-1/+1
|
* Remove double png.Marin Jankovski2015-09-171-1/+1
|
* Add Gmail actions button for GitLab doc.Marin Jankovski2015-09-172-0/+22
|
* Merge branch 'fix-issue-2382' into 'master'Stan Hu2015-09-1712-14/+83
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png) Closes #2382 See merge request !1227
| * Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu2015-09-1512-14/+83
| | | | | | | | | | | | | | | | | | | | | | for posterity. Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Add "in" preposition when creating and destroying milestones Closes #2382
* | Merge branch 'enable_ssl_by_default' into 'master'Valery Sizov2015-09-174-4/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | Enable SSL by default https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1135 See merge request !1299
| * | enable SSL by defaultenable_ssl_by_defaultValery Sizov2015-09-174-4/+16
| | |
* | | Merge branch 'fix-ci-500-on-settings' into 'master'Dmitriy Zaporozhets2015-09-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 on CI project settings Fix: https://gitlab.com/gitlab-org/gitlab-ce/issues/2546 /cc @dzaporozhets See merge request !1321
| * | | Fix 500 on CI project settingsfix-ci-500-on-settingsKamil Trzcinski2015-09-161-1/+1
| | | |
* | | | Merge branch 'fix-public-projects' into 'master'Dmitriy Zaporozhets2015-09-171-5/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix displaying public projects Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2552 See merge request !1318
| * | | | Fix displaying public projectsfix-public-projectsKamil Trzcinski2015-09-161-5/+0
| | | | |
* | | | | Merge branch 'restrict-user-api-integers' into 'master'Dmitriy Zaporozhets2015-09-173-1/+58
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict users API endpoints to use integer IDs Closes #2267 See merge request !1156
| * | | | | Restrict users API endpoints to use integer IDsStan Hu2015-08-233-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | Closes #2267
* | | | | | Merge branch 'fix-gh-issue-9640' into 'master'Dmitriy Zaporozhets2015-09-172-1/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix HTML link that was improperly escaped in new user e-mail ### Before: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/e42e73f04971d8dd949b034846d2bb9f/image.png) ### After: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/90425911345031a4b8e9374323728f79/image.png) Closes https://github.com/gitlabhq/gitlabhq/issues/9640 See merge request !1323
| * | | | | Fix HTML link that was improperly escaped in new user e-mailStan Hu2015-09-162-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9640
* | | | | | Merge branch 'update-mailroom' into 'master'Robert Speicher2015-09-162-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | See merge request !1306
| * | | | | Fix Gemfile.lockDouwe Maan2015-09-161-1/+1
| | | | | |
| * | | | | Merge branch 'master' into update-mailroomDouwe Maan2015-09-16351-460/+16498
| |\ \ \ \ \
| * | | | | | Update mail_roomDouwe Maan2015-09-162-3/+6
| | | | | | |
* | | | | | | Merge branch 'fix-nginx' into 'master'Kamil TrzciƄski2015-09-162-0/+24
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing proxy requests to migration docs See merge request !1317
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 7-14-stable to 8-0-stable in doc/install/installation.md Also fixes sudo user from previous MR. [ci skip] See merge request !1320
| * | | | | | | sudo user is git, not gitlab, not gitlab_ciRobert Speicher2015-09-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Change 7-14-stable to 8-0-stable in doc/install/installation.mdRobert Speicher2015-09-161-4/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'rs-fix-update-guide' into 'master'Robert Speicher2015-09-161-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 7.14 to 8.0 update guide [ci skip] See merge request !1319
| * | | | | | | 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 sidebar Back link should always be responsible for sidebar navigation below. It should change sidebar navigation to one level up See merge request !1316
| * | | | | | Fix confusing behaviour of back link in CI sidebarDmitriy Zaporozhets2015-09-165-10/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Back link should always be responsible for sidebar navigation below. It should change sidebar navigation to one level up
* | | | | | Merge branch 'style-ci-page' into 'master'Dmitriy Zaporozhets2015-09-164-21/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style CI projects page and builds list Partly implements #2545 See merge request !1315
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix default avatars to ensure that helpers don't have /assets dir appended See issue #2555 See merge request !1314
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
| * | | | | | 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 CI * link from dashboard to CI dashboard * link from project to CI project Its a fast solution for 8.0. Might be improved in later versions Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1313
| * | | | | | | Add links from GitLab to CIDmitriy Zaporozhets2015-09-163-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'fix-gitlab-ci-in-ce' into 'master'Dmitriy Zaporozhets2015-09-168-4/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix first bunch of regressions in GitLab CI /cc @vsizov @dzaporozhets See merge request !1312
| * | | | | | | 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
| | | | | | | |