summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Wrap issue details to prevent content misalignmentissue_13359Alfredo Sumaran2016-02-162-9/+16
* Change "opened by" to just "by"Alfredo Sumaran2016-02-161-1/+1
* Prevent author name to split into multiple linesAlfredo Sumaran2016-02-151-1/+1
* Prevent split time into multiple lines for better readingAlfredo Sumaran2016-02-151-0/+4
* Move issue details after action buttonsAlfredo Sumaran2016-02-151-10/+10
* Merge branch 'offline-migration-docs' into 'master' Douwe Maan2016-02-151-1/+5
|\
| * Add notice about offline migrationsoffline-migration-docsKamil Trzciński2015-11-021-1/+5
* | Merge branch 'fix-me-me-me-me' into 'master' Valery Sizov2016-02-154-2/+39
|\ \
| * | Add spinach tests for award emojifix-me-me-me-meStan Hu2016-02-132-1/+36
| * | Fix duplicate "me" in tooltip of the "thumbsup" awards EmojiStan Hu2016-02-132-1/+3
* | | Merge branch 'update-omniauth-1-3-1' into 'master' Robert Speicher2016-02-132-4/+4
|\ \ \
| * | | Update omniauth to 1.3.1 for memory performanceTakuya Noguchi2016-02-132-4/+4
* | | | Merge branch 'fix/ci-emails-broken-link' into 'master' Douwe Maan2016-02-138-279/+302
|\ \ \ \
| * | | | Move profile notifications specs to separate filefix/ci-emails-broken-linkGrzegorz Bizon2016-02-122-98/+107
| * | | | Move build emails specs to separate fileGrzegorz Bizon2016-02-123-177/+186
| * | | | Add Changelog entry for links fixes in build emailsGrzegorz Bizon2016-02-121-0/+1
| * | | | Fix broken link in CI build notification emailsGrzegorz Bizon2016-02-124-46/+50
* | | | | Merge branch 'ben.boeckel/gitlab-ce-fixup-links-in-generic-docs' into 'master' Douwe Maan2016-02-138-32/+46
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docsBen Boeckel2016-02-128-32/+46
* | | | | Merge branch 'backup_ci_rm' into 'master' Achilleas Pipinellis2016-02-121-2/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove note on backing up GitLab CI as a separate serviceAchilleas Pipinellis2016-02-131-2/+0
| | |/ / | |/| |
* | | | Merge branch 'fix-duplicate-hook-notifications' into 'master' Douwe Maan2016-02-123-10/+3
|\ \ \ \
| * | | | Fix duplicated branch creation/deletion Web hooks/service notifications when ...Stan Hu2016-02-093-10/+3
* | | | | Merge branch 'fix_500-commit-null' into 'master' Douwe Maan2016-02-121-1/+1
|\ \ \ \ \
| * | | | | Don't try to mark broken MR as mergableNemanja Boric2016-02-111-1/+1
* | | | | | Merge branch 'rs-issue-merge-requests' into 'master' Douwe Maan2016-02-121-3/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Correct indentation for `issues/merge_requests` partial renderrs-issue-merge-requestsRobert Speicher2016-02-111-3/+3
* | | | | | Merge branch 'rs-loosen-nokogiri' into 'master' Dmitriy Zaporozhets2016-02-122-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Loosen Nokogiri version requirementrs-loosen-nokogiriRobert Speicher2016-02-112-2/+2
* | | | | | Merge branch 'workhorse-0.6.4' into 'master' Rémy Coutable2016-02-123-3/+3
|\ \ \ \ \ \
| * | | | | | Use gitlab-workhorse 0.6.4workhorse-0.6.4Jacob Vosmaer2016-02-123-3/+3
* | | | | | | Merge branch 're-add-update-configuration-files-in-latest-upgrade-guide' into...Rémy Coutable2016-02-121-2/+12
|\ \ \ \ \ \ \
| * | | | | | | Re-add "Update configuration files" section in the 8.4 to 8.5 upgrade guideRémy Coutable2016-02-121-2/+12
* | | | | | | | Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master' Douwe Maan2016-02-124-12/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-orderOliver Rogers2016-02-104-12/+10
* | | | | | | | Merge branch 'typo_api_builds_doc' into 'master' Achilleas Pipinellis2016-02-121-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo in doc/api/builds.mdAchilleas Pipinellis2016-02-121-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'streamline-email-validation' into 'master' Douwe Maan2016-02-1211-53/+89
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Re-add EmailValidator to avoid the repetition of format: { with: Devise.email...streamline-email-validationRémy Coutable2016-02-095-6/+10
| * | | | | | | Validate email addresses using Devise.email_regexpRémy Coutable2016-02-0911-58/+90
* | | | | | | | Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into 'ma...Douwe Maan2016-02-124-5/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a spec for setting/updating a MR's milestone via the APIskakirill/gitlab-ce-api-merge-request-setup-milestoneRémy Coutable2016-02-091-3/+12
| * | | | | | | | API: Allow to set or update a merge-request's milestoneKirill Skachkov2016-02-083-2/+7
* | | | | | | | | Merge branch 'issue_13369' into 'master' Robert Speicher2016-02-121-8/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't show fork button if user can't fork the project.issue_13369Rubén Dávila2016-02-111-8/+9
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'issue_13365' into 'master' Robert Speicher2016-02-121-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Load all blob data when highlighting content for git-blame.Rubén Dávila2016-02-111-0/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'fix_markdown_image_link' into 'master' Achilleas Pipinellis2016-02-112-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a new image in the markdown help pageAchilleas Pipinellis2016-02-112-4/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'remove_sqlite_check' into 'master' Jeroen van Baarsen2016-02-111-18/+0
|\ \ \ \ \ \ \ \