summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't try to count a relation with aliases18446-when-this-merge-request-is-accepted-this-issue-will-be-closed-automatically-rendered-twiceSean McGivern2016-06-104-7/+7
* Only show issues closing MR when presentSean McGivern2016-06-101-2/+0
* Merge branch 'fix/incremental-trace-update-api' into 'master' Rémy Coutable2016-06-102-2/+3
|\
| * Update CHANGELOGTomasz Maczukin2016-06-101-0/+1
| * Fix UTF-8 handling in incremental trace update APITomasz Maczukin2016-06-101-2/+2
* | Merge branch 'ruianderson/gitlab-ce-option-to-allow-or-not-merge-failed-build...Rémy Coutable2016-06-1017-42/+378
|\ \
| * | Rename ci_commit -> pipelineRémy Coutable2016-06-104-20/+20
| * | Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergea...Rémy Coutable2016-06-105-57/+64
| * | Add documentation for the 'only_allow_merge_if_build_succeeds.rb' featureRémy Coutable2016-06-102-0/+11
| * | Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'...Rémy Coutable2016-06-106-73/+113
| * | Allow or not merge MR with failed buildRui Anderson2016-06-1015-23/+301
| |/
* | Merge branch 'fix-already-initialized-constant' into 'master' Stan Hu2016-06-101-1/+1
|\ \ | |/ |/|
| * Don't require Gitlab::Redis in mail_room.yml if it's already definedRémy Coutable2016-06-101-1/+1
|/
* Merge branch 'cs-issue-pr-templates' into 'master' Rémy Coutable2016-06-102-0/+6
|\
| * Address feedback about wording.cs-issue-pr-templatesConnor Shea2016-06-092-4/+4
| * Add ISSUE_TEMPLATE.md and PULL_REQUEST_TEMPLATE.md to point contributors towa...Connor Shea2016-06-092-0/+6
* | Merge branch 'enable-rubocop-for-migrations' into 'master' Douwe Maan2016-06-10343-1/+344
|\ \
| * | Enable RuboCop for migrationsenable-rubocop-for-migrationsSean McGivern2016-06-09343-1/+344
| |/
* | Merge branch 'gh-rate-limit' into 'master' Douwe Maan2016-06-102-57/+40
|\ \
| * | Wrap all rate limiting logic inside GitHub API clientgh-rate-limitDouglas Barbosa Alexandre2016-06-092-57/+40
| |/
* | Merge branch '18447-investigate-smtp-error' into 'master' Douwe Maan2016-06-101-2/+2
|\ \
| * | Fix failing `EmailOnPush` spec.Timothy Andrew2016-06-101-2/+2
|/ /
* | Merge branch 'award-emoji-fixes' into 'master' Jacob Schatz2016-06-096-19/+17
|\ \
| * | Minor MR comment fixes.Fatih Acet2016-06-101-6/+6
| * | Ignore frequent emojis in search.award-emoji-fixesFatih Acet2016-06-091-2/+2
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-0914-101/+156
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-092-18/+99
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-0933-151/+309
| |\ \ \
| * | | | Move award_menu_url variable into gon object.Fatih Acet2016-06-094-11/+8
| * | | | Render frequent emoji block once.Fatih Acet2016-06-091-1/+3
| * | | | Instantiate awardsHandler in application main script.Fatih Acet2016-06-092-2/+1
* | | | | Update CHANGELOG for 8.8.4 and 8.8.5Robert Speicher2016-06-091-4/+6
* | | | | Merge branch 'fix-issue-15259-postgresql' into 'master' Robert Speicher2016-06-091-1/+1
|\ \ \ \ \
| * | | | | Properly quote table name in Rake task for MySQL and PostgreSQL compatibilityfix-issue-15259-postgresqlStan Hu2016-06-091-1/+1
* | | | | | Merge branch 'milestone-tooltip' into 'master' Jacob Schatz2016-06-096-6/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipmilestone-tooltipFatih Acet2016-06-0916-119/+255
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0954-182/+542
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0949-85/+224
| |\ \ \ \ \
| * | | | | | Fixes for MR comments.Fatih Acet2016-06-094-5/+5
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-08244-2438/+5858
| |\ \ \ \ \ \
| * | | | | | | Copy changes for milestone due dates.Fatih Acet2016-06-083-3/+3
| * | | | | | | Revert milestone_remaining_days helper.Fatih Acet2016-06-081-10/+5
| * | | | | | | Use title attribute instead of data-original-title.Fatih Acet2016-06-082-4/+4
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-06199-1196/+4637
| |\ \ \ \ \ \ \
| * | | | | | | | Favor the ternary operator. :police_car:Fatih Acet2016-06-061-1/+1
| * | | | | | | | Update CHANGELOG.Fatih Acet2016-06-031-0/+1
| * | | | | | | | Show milestone remaining tooltip in right sidebar.Fatih Acet2016-06-033-9/+27
| * | | | | | | | Added a new common util called $.timefor.Fatih Acet2016-06-031-0/+24
* | | | | | | | | Merge branch 'autocomplete-comment-fix' into 'master' Jacob Schatz2016-06-091-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Checks based on whether data is loaded not undefinedPhil Hughes2016-06-091-1/+4
View Lorry Controller Status