summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Tweak textrename-reply-by-emailDouwe Maan2015-09-212-4/+4
* Merge branch 'master' into rename-reply-by-emailDouwe Maan2015-09-2120-84/+266
|\
| * Merge branch 'optimize-ci-tags-migration' into 'master' Marin Jankovski2015-09-217-73/+191
| |\
| | * Use INSERT INTO to insert tagsKamil Trzcinski2015-09-211-7/+8
| | * Change wordingoptimize-ci-tags-migrationKamil Trzcinski2015-09-212-2/+2
| | * Disable CI for time of migrationKamil Trzcinski2015-09-211-0/+13
| | * Change notices during migratingKamil Trzcinski2015-09-211-2/+2
| | * Create CI migration task on GitLab sideKamil Trzcinski2015-09-204-40/+152
| | * Use pure SQL queries to migrate CI tagsKamil Trzcinski2015-09-201-33/+25
| * | Merge branch 'fail-ci-builds-without-yml' into 'master' Dmitriy Zaporozhets2015-09-213-1/+15
| |\ \
| | * | Rubocop fixfail-ci-builds-without-ymlKamil Trzcinski2015-09-201-1/+1
| | * | Fail builds if no .gitlab-ci.yml is foundKamil Trzcinski2015-09-203-1/+15
| | |/
| * | Merge branch 'fix-markdown-links-in-dashboard' into 'master' Douwe Maan2015-09-213-2/+14
| |\ \
| | * | Fix Markdown links not showing up in dashboard activity feedStan Hu2015-09-203-2/+14
| * | | Merge branch 'reply-by-email-diff' into 'master' Robert Speicher2015-09-215-7/+24
| |\ \ \
| | * | | Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diffDouwe Maan2015-09-205-7/+24
| * | | | Merge branch 'gmail_actions_doc' into 'master' Job van der Voort2015-09-203-1/+23
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | 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-ci-link-on-project-page' into 'master' Kamil Trzciński2015-09-201-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix 500 when showing project page and there's no CI project presentfix-ci-link-on-project-pageKamil Trzcinski2015-09-181-1/+1
* | | | | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-2117-175/+151
|/ / / /
* | | | Merge branch 'style-pagination' into 'master' Dmitriy Zaporozhets2015-09-204-10/+43
|\ \ \ \
| * | | | Apply new design to paginationstyle-paginationDmitriy Zaporozhets2015-09-194-10/+43
| | |_|/ | |/| |
* | | | Merge branch 'ci-build-list' into 'master' Dmitriy Zaporozhets2015-09-2013-144/+180
|\ \ \ \
| * | | | Cleanup GitLab CI UIci-build-listDmitriy Zaporozhets2015-09-1912-162/+132
| * | | | Return callout css for CIDmitriy Zaporozhets2015-09-191-0/+45
| * | | | Merge branch 'master' into ci-build-listDmitriy Zaporozhets2015-09-1940-387/+109
| |\ \ \ \ | | |/ / /
| * | | | Add colors to build labelsDmitriy Zaporozhets2015-09-185-13/+57
| * | | | Merge branch 'master' into ci-build-listDmitriy Zaporozhets2015-09-1887-171/+227
| |\ \ \ \
| * | | | | Style CI project/build listDmitriy Zaporozhets2015-09-1811-46/+21
* | | | | | Merge branch 'jwt' into 'master' Douwe Maan2015-09-202-4/+1
|\ \ \ \ \ \
| * | | | | | Removed format validationKirilll Zaitsev2015-09-192-4/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rs-bump-two-factor' into 'master' Douwe Maan2015-09-2011-21/+32
|\ \ \ \ \ \
| * | | | | | Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-197-11/+16
| * | | | | | Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher2015-09-194-6/+6
| * | | | | | Bump devise to 3.5.2Robert Speicher2015-09-192-4/+10
| |/ / / / /
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Schilling2015-09-201-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #9646 from sameersbn/fix-link-to-docsRobert Schilling2015-09-201-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | fixes link to reply_by_email docsSameer Naik2015-09-201-1/+1
| |/ / / / /
* | | | | | Merge branch 'fix-failing-migration' into 'master' Robert Speicher2015-09-192-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix failing migration on mysqlHannes Rosenögger2015-09-182-2/+2
* | | | | | Merge branch 'rs-issue-2597' into 'master' Robert Speicher2015-09-181-4/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix IssuableContext javascriptRobert Speicher2015-09-181-4/+5
|/ / / / /
* | | | | Merge branch 'ci_closer_integration' into 'master' Kamil Trzciński2015-09-1822-297/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-1822-297/+31
* | | | | Fix gitlab ci projects page UIDmitriy Zaporozhets2015-09-181-9/+9
* | | | | Merge branch 'fix-doc-typo' into 'master' Robert Speicher2015-09-181-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix typo in Reply by email docsfix-doc-typoDouwe Maan2015-09-181-2/+2
| | |/ / | |/| |