summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove docs and rake task for gmail actions to prevent problems with registra...changes_for_gmail_inbox_actionsMarin Jankovski2015-07-223-101/+0
* Use mdash to prevent breaking html emails.Marin Jankovski2015-07-221-1/+1
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-07-228-12/+86
|\
| * Merge branch 'fix-cache-clear-test-issue' into 'master'Stan Hu2015-07-221-6/+2
| |\
| | * Clearing the entire Redis cache may be too expensive; just useStan Hu2015-07-211-6/+2
| |/
| * Merge branch 'fix-dup-changelog-entry' into 'master'Stan Hu2015-07-221-2/+1
| |\
| | * Remove 7.14 entry that was pushed to 7.13Stan Hu2015-07-211-2/+1
| |/
| * Merge branch 'fix-404-empty-repo' into 'master'Stan Hu2015-07-225-8/+47
| |\
| | * Fix 404 error in files view after deleting the last file in a repositoryStan Hu2015-07-215-8/+46
| * | Merge branch 'fix-snippet-note-fullscreen' into 'master'Hannes Rosenögger2015-07-212-1/+5
| |\ \
| | * | Fix full screen mode for snippet commentsDaniel Gerhardt2015-07-212-1/+5
| |/ /
| * | Merge branch 'document-2fa-backup' into 'master' Valery Sizov2015-07-212-2/+38
| |\ \
| | * | You need to store your DB encryption keydocument-2fa-backupJacob Vosmaer2015-07-212-2/+38
| * | | Merge branch 'changelog_update' into 'master' Valery Sizov2015-07-211-2/+2
| |\ \ \
| | * | | Update changelogchangelog_updateValery Sizov2015-07-211-2/+2
| |/ / /
* | | | Merge branch 'fork-project' into 'master' Job van der Voort2015-07-223-1/+23
|\ \ \ \ | |/ / / |/| | |
| * | | fixed imagekaren Carias2015-07-211-1/+1
| * | | added Fork Project documentkaren Carias2015-07-213-1/+23
|/ / /
* | | Merge branch 'overwrite-during-backup' into 'master' Valery Sizov2015-07-211-0/+1
|\ \ \ | |_|/ |/| |
| * | Don't stop if database.sql.gz already existsoverwrite-during-backupJacob Vosmaer2015-07-211-0/+1
|/ /
* | Merge branch 'fix-changelog-7.11-7.12' into 'master'Robert Schilling2015-07-201-3/+1
|\ \
| * | Fix change log for 7.11 and move entry to 7.12Daniel Gerhardt2015-07-201-3/+1
|/ /
* | Merge branch 'gc-images-no-casing' into 'master'Stan Hu2015-07-203-1/+7
|\ \
| * | GoogleCode importer: Do not care about casing of image file extensionsSven Strickroth2015-07-203-1/+7
* | | Merge branch 'fix-disabled-feature-access' into 'master'Stan Hu2015-07-202-23/+32
|\ \ \
| * | | Fix access to disabled features for unauthenticated usersDaniel Gerhardt2015-07-202-23/+32
* | | | Merge branch 'mr-fetch-command' into 'master'Stan Hu2015-07-202-0/+11
|\ \ \ \
| * | | | merge_requests: add fetch command to the MR pageBen Boeckel2015-07-202-0/+11
| | |_|/ | |/| |
* | | | Merge branch 'fix-slow-repository-cache-update' into 'master'Valery Sizov2015-07-202-19/+2
|\ \ \ \
| * | | | Remove repository graph log to fix slow cache updates after push eventStan Hu2015-07-192-19/+2
* | | | | Merge branch 'remove-redundant-last-push' into 'master'Valery Sizov2015-07-201-1/+3
|\ \ \ \ \
| * | | | | Remove redundant last push event if activity feed is set to main pageStan Hu2015-07-181-1/+3
* | | | | | Merge branch 'activity_publicly_accessible' into 'master' Valery Sizov2015-07-201-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Public project activity page asks for sign-inactivity_publicly_accessibleValery Sizov2015-07-201-1/+1
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-07-201-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #9400 from tuxillo/patch-1Jacob Vosmaer2015-07-201-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Use whoami instead of $USERAntonio Huete Jimenez2015-06-191-1/+1
* | | | | | | Merge branch 'set-omniauth-full-host' into 'master'Marin Jankovski2015-07-202-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Set OmniAuth full_host parameter to ensure redirect URIs are correctStan Hu2015-07-172-0/+2
* | | | | | | Merge branch 'fix-unauthenticated-label-access' into 'master'Stan Hu2015-07-203-1/+7
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix label read access for unauthenticated usersDaniel Gerhardt2015-07-193-1/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'rs-issue-2001' into 'master' Valery Sizov2015-07-191-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Dynamically check `:admin_*` ability in issuable contextRobert Speicher2015-07-191-2/+2
|/ / / / /
* | | | | Merge branch 'fix-mixed-color-preview' into 'master'Valery Sizov2015-07-191-1/+1
|\ \ \ \ \
| * | | | | Fix bug where notes were being rendered with wrong color preferences due to c...Stan Hu2015-07-181-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-oauth-redirection' into 'master'Stan Hu2015-07-192-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix OAuth provider bug where GitLab would not go return to the redirect_uri a...Stan Hu2015-07-182-1/+3
|/ / / /
* | | | Merge branch 'rs-issue-2013' into 'master' Robert Speicher2015-07-181-3/+9
|\ \ \ \
| * | | | Show the first tab automatically on MergeRequests#newrs-issue-2013Robert Speicher2015-07-181-3/+9
|/ / / /
* | | | Merge pull request #9452 from YorickPeterse/masterRobert Speicher2015-07-181-5/+5
|\ \ \ \ | |/ / / |/| | |