summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve #set_award! on the Note model12792-emoji-as-text-diff-commentZeger-Jan van de Weg2016-02-192-5/+5
* Emoji reponses on diffs aren't award emojiZeger-Jan van de Weg2016-02-194-4/+14
* Merge branch '12791-hide-project-limit-reached-warning' into 'master' Douwe Maan2016-02-192-1/+2
|\
| * Project limit is reached warning is hidden when the projects_limit is zeroZeger-Jan van de Weg2016-02-192-1/+2
|/
* Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-1913-3113/+20165
|\
| * Update Emoji sprite and its SCSS for new stylesrs-emojiRobert Speicher2016-02-172-1269/+1723
| * Update fixtures/emojis/aliases.jsonRobert Speicher2016-02-152-3/+153
| * Update fixtures/emojis/index.jsonRobert Speicher2016-02-151-1823/+18276
| * Fix specs expecting `emoji/` in image pathRobert Speicher2016-02-132-3/+3
| * Update Emoji asset pathRobert Speicher2016-02-123-4/+5
| * Update gitlab_emoji to ~> 0.3.0Robert Speicher2016-02-122-5/+5
| * Remove unused emoji_autocomplete_source helperRobert Speicher2016-02-121-6/+0
* | Merge branch 'fix/project-forks-page' into 'master' Douwe Maan2016-02-193-1/+14
|\ \
| * | update based on feedbackJames Lopez2016-02-192-2/+2
| * | updated fix based on MR feedbackJames Lopez2016-02-175-11/+4
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-for...James Lopez2016-02-1751-261/+743
| |\ \
| * | | workaround for forks with an invalid repo - avoid showing them in the listJames Lopez2016-02-163-1/+21
* | | | Merge branch 'rs-show-owner-label' into 'master' Douwe Maan2016-02-192-9/+19
|\ \ \ \
| * | | | Allow `ProjectTeam#human_max_access` to return "Owner"rs-show-owner-labelRobert Speicher2016-02-182-9/+19
* | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-191-2/+2
|\ \ \ \ \
| * | | | | number_with_delimiter() addedheiko2016-02-191-2/+2
|/ / / / /
* | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-181-1/+1
|\ \ \ \ \
| * | | | | bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed...Richard Pidgeon2016-02-181-1/+1
* | | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-181-21/+0
|\ \ \ \ \ \
| * | | | | | No changes to nginx config in this update. Removed unnecessary instructions.Brandon Patton2016-02-181-21/+0
* | | | | | | Merge branch 'revert-2782' into 'master' Douwe Maan2016-02-188-378/+27
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-188-378/+27
|/ / / / / /
* | | | | | Merge branch 'rs-sentry-release-tracking' into 'master' Douwe Maan2016-02-182-2/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add release tracking for Sentryrs-sentry-release-trackingRobert Speicher2016-02-172-2/+3
* | | | | | Merge branch 'saml-decoupling' into 'master' Robert Speicher2016-02-188-27/+378
|\ \ \ \ \ \
| * | | | | | Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-188-27/+378
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'cache-clear' into 'master' Robert Speicher2016-02-182-5/+18
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into cache-c...Jacob Vosmaer2016-02-1864-208/+777
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Use SCAN during 'rake cache:clear'cache-clearJacob Vosmaer2016-02-182-5/+18
* | | | | | | Merge branch 'autocrlf-lazy' into 'master' Robert Speicher2016-02-182-11/+71
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Handle raw_repository returning nil in exists?autocrlf-lazyYorick Peterse2016-02-182-0/+8
| * | | | | | Use Repository#exists? in Repository#commit?Yorick Peterse2016-02-181-1/+1
| * | | | | | Added specs for Repository#exists?Yorick Peterse2016-02-181-0/+13
| * | | | | | Fixed Repository#exists? to handle errorsYorick Peterse2016-02-181-6/+5
| * | | | | | Only set autocrlf when creating/updating filesYorick Peterse2016-02-182-5/+45
* | | | | | | Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master' Dmitriy Zaporozhets2016-02-182-16/+2
|\ \ \ \ \ \ \
| * | | | | | | Uses cross browser niceScroll to do scrolling on sidebar.Jacob Schatz2016-02-182-16/+2
|/ / / / / / /
* | | | | | | Merge branch 'fix/ci-first-job-allow-failure' into 'master' Kamil Trzciński2016-02-187-3/+117
|\ \ \ \ \ \ \
| * | | | | | | Add specs covering bug in build allowed to fail caseGrzegorz Bizon2016-02-181-0/+29
| * | | | | | | Add Changelog entry for builds scheduler fixfix/ci-first-job-allow-failureGrzegorz Bizon2016-02-181-0/+1
| * | | | | | | Fix builds scheduler when first build is allowed to failGrzegorz Bizon2016-02-183-3/+33
| * | | | | | | Add specs for build status helper classGrzegorz Bizon2016-02-183-3/+36
| * | | | | | | Return a builds array in builds create serviceGrzegorz Bizon2016-02-182-0/+21
* | | | | | | | Merge branch 'rs-git-fetch-labels' into 'master' Kamil Trzciński2016-02-181-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix labels for git clone/git fetch Project CI settingrs-git-fetch-labelsRobert Speicher2016-02-161-2/+2
View Lorry Controller Status