summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Hide password in the service settings formhide_services_passwordValery Sizov2015-10-025-3/+14
* Added benchmark-ips to the GemfileYorick Peterse2015-10-022-0/+4
* Merge branch 'add_last_push_widget' into 'master' Dmitriy Zaporozhets2015-10-022-0/+4
|\
| * Add last push widget to starred projects dashboardDrew Blessing2015-10-012-0/+4
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2015-10-013-3/+38
|\ \
| * \ Merge branch 'upgrade-version' into 'master' Patricio Cano2015-10-011-3/+9
| |\ \
| | * \ solved conflictkaren Carias2015-09-30757-2068/+21025
| | |\ \
| | * | | made info more clearkaren Carias2015-09-091-1/+3
| | * | | link to rake taskskaren Carias2015-09-081-1/+6
| * | | | Merge branch 'create-issue' into 'master' Patricio Cano2015-10-012-0/+29
| |\ \ \ \
| | * | | | more info about MR and mentionskaren Carias2015-08-311-1/+1
| | * | | | New doc about how to create an issuekaren Carias2015-08-252-0/+29
* | | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqStan Hu2015-10-012-1/+7
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #9684 from NKMR6194/masterStan Hu2015-10-012-1/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix link with emojiSAKATA Sinji2015-10-022-1/+7
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'rs-update-note' into 'master'Robert Speicher2015-10-014-9/+14
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Update CHANGELOGRobert Speicher2015-10-011-0/+1
| * | | | | Simplify Note#editable?rs-update-noteRobert Speicher2015-09-301-1/+1
| * | | | | Ensure notes are highlighted properly when they're updatedRobert Speicher2015-09-301-7/+9
| * | | | | Don't render the edit_form view for system notesRobert Speicher2015-09-301-1/+3
* | | | | | Merge branch 'mail-footer-text' into 'master' Dmitriy Zaporozhets2015-10-012-2/+1
|\ \ \ \ \ \
| * | | | | | Remove email footer textZeger-Jan van de Weg2015-10-012-2/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'update-gitlab-git' into 'master' Robert Speicher2015-10-012-3/+6
|\ \ \ \ \ \
| * | | | | | Update gitlab_git to 7.2.17.Douwe Maan2015-10-012-3/+6
* | | | | | | Merge branch 'etc-default-gitlab' into 'master' Drew Blessing2015-10-011-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix path to /etc/default/gitlab in 8.0 update guideetc-default-gitlabJacob Vosmaer2015-09-251-1/+1
* | | | | | | Merge branch 'ee_features_in_example_config' into 'master' Dmitriy Zaporozhets2015-10-011-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Removes reference to Enterprise Edition ssh key sync feature.Ted Strzalkowski2015-07-211-1/+0
* | | | | | | | Merge branch 'show-diff-stats-for-mr'Dmitriy Zaporozhets2015-10-015-19/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid unnecessary usage of local varsshow-diff-stats-for-mrDmitriy Zaporozhets2015-10-012-6/+3
| * | | | | | | | Show additions/deletions stats on merge request diffDmitriy Zaporozhets2015-10-015-19/+37
* | | | | | | | | Merge branch 'fix-email-typo' into 'master' Dmitriy Zaporozhets2015-10-011-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | notify: fix typo in merged_merge_request_email templateBen Boeckel2015-09-301-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-visit-project-button' into 'master' Dmitriy Zaporozhets2015-10-011-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make Visit project on GitLab button goes to The internal Gitlab projectJeroen van Baarsen2015-09-181-1/+1
* | | | | | | | | | Add CHANGELOG itemDmitriy Zaporozhets2015-10-011-0/+1
* | | | | | | | | | Merge branch 'fix-work-with-multibyte-chars-in-ldap-uid' into 'master' Dmitriy Zaporozhets2015-10-011-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add support of multibyte characters in LDAP UIDПетров Роман2015-09-301-1/+1
* | | | | | | | | | | Merge branch 'stanhu/gitlab-ce-fix-message-id-notify'Dmitriy Zaporozhets2015-10-013-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being d...Stan Hu2015-10-013-1/+3
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'style-changed-files' into 'master' Dmitriy Zaporozhets2015-10-013-15/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Better colors for textstyle-changed-filesDmitriy Zaporozhets2015-10-013-6/+9
| * | | | | | | | | | | Improve UI for list of changed filesDmitriy Zaporozhets2015-10-011-12/+15
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-500-compare' into 'master' Dmitriy Zaporozhets2015-10-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix 500 error on compare pagefix-500-compareDmitriy Zaporozhets2015-10-011-1/+1
* | | | | | | | | | | | Merge branch 'disable-report-button-if-already-reported' into 'master' Douwe Maan2015-10-018-11/+35
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Streamline the "Report button"rymai/gitlab-ce-disable-report-button-if-already-reportedRémy Coutable2015-09-299-67/+27
| * | | | | | | | | | | | Disable the "Report abuse" button if a user has already been reportedRémy Coutable2015-09-297-9/+73
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ci-fixes' into 'master' Kamil Trzciński2015-10-013-9/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix: CI token removal regression from build traceci-fixesKamil Trzcinski2015-10-012-7/+21
View Lorry Controller Status