summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix time_ago_with_tooltip for activity feedrs-timeagoRobert Speicher2015-12-112-5/+10
* Update CHANGELOGRobert Speicher2015-12-111-0/+1
* Merge branch 'mr-statuses' into 'master' Robert Speicher2015-12-116-1/+59
|\
| * display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statusesGreg Smethells2015-12-116-1/+59
* | Merge branch 'revert-2037' into 'master' Dmitriy Zaporozhets2015-12-114-2/+6
|\ \
| * | Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037Douwe Maan2015-12-114-2/+6
| |/
* | Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master'Robert Speicher2015-12-114-8/+46
|\ \ | |/ |/|
| * [ci skip] Update CHANGELOGfix-delete-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-101-0/+1
| * Remove note from MR discussion when deleting it in the changes tabDouglas Barbosa Alexandre2015-12-103-8/+45
* | Merge branch 'feature/project_js_from_ee' into 'master' Douwe Maan2015-12-111-2/+5
|\ \
| * | Aling project js with EEBorja Aparicio2015-12-101-2/+5
* | | Merge branch 'complexity/rubocop-metrics' into 'master' Douwe Maan2015-12-1110-156/+368
|\ \ \
| * | | Mix url helpers in into `RepositoryPush`Grzegorz Bizon2015-12-111-9/+10
| * | | Bump cyclomatic and perceived complexity threshold by oneGrzegorz Bizon2015-12-081-2/+2
| * | | Refactor CI YAML processor's validatorsGrzegorz Bizon2015-12-082-29/+43
| * | | Check if commits are available in `RepositoryPush`Grzegorz Bizon2015-12-081-3/+3
| * | | Duplicate options in `RepositoryPush`Grzegorz Bizon2015-12-081-4/+4
| * | | Move `common_mentionable_setup` to shared context in specsGrzegorz Bizon2015-12-081-3/+3
| * | | Add `RepositoryPush` specsGrzegorz Bizon2015-12-082-5/+127
| * | | Fix specs by adding forgotten instance variableGrzegorz Bizon2015-12-081-0/+3
| * | | Fix url helpers in RepositoryPushGrzegorz Bizon2015-12-081-3/+4
| * | | Remove obsolete variables in `repository_push_email`Grzegorz Bizon2015-12-084-48/+46
| * | | Improve Messagee::RepositoryPushGrzegorz Bizon2015-12-082-64/+68
| * | | Refactor RepositoryPush, move to Message namespaceGrzegorz Bizon2015-12-083-134/+140
| * | | Make `can_send_from_user_email?` public in NotifyGrzegorz Bizon2015-12-081-2/+2
| * | | Extract repository_push_email to separate classGrzegorz Bizon2015-12-082-77/+135
| * | | Enable rubocop metricsGrzegorz Bizon2015-12-081-19/+24
* | | | Merge branch 'fix/award-emoji-alert-width' into 'master' Grzegorz Bizon2015-12-114-13/+4
|\ \ \ \
| * | | | Update changelogGrzegorz Bizon2015-12-111-0/+1
| * | | | Fix award-emojis alert flash messageGrzegorz Bizon2015-12-113-13/+3
|/ / / /
* | | | Merge branch 'emoji_aliases' into 'master' Valery Sizov2015-12-116-3/+55
|\ \ \ \
| * | | | emoji aliases problemValery Sizov2015-12-116-3/+55
|/ / / /
* | | | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'Douwe Maan2015-12-113-3/+39
|\ \ \ \
| * | | | Target right releaseZeger-Jan van de Weg2015-12-101-1/+1
| * | | | Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-12-101055-9051/+18539
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Licence also accepted as license fileZeger-Jan van de Weg2015-12-103-9/+26
| * | | | Set changelog item to right releaseZeger-Jan van de Weg2015-11-111-1/+1
| * | | | Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-11-11653-4489/+10685
| |\ \ \ \
| * | | | | Add specs on #licenseZeger-Jan van de Weg2015-10-153-2/+17
| * | | | | Add changelog line to right releaseZeger-Jan van de Weg2015-10-141-2/+1
| * | | | | Prefer Licence over CopyingZeger-Jan van de Weg2015-10-141-3/+7
| * | | | | COPYING is now also accepted as licence fileZeger-Jan van de Weg2015-10-142-3/+5
* | | | | | Merge branch 'rs-update-gitlab_emoji' into 'master' Valery Sizov2015-12-112-2/+2
|\ \ \ \ \ \
| * | | | | | Bump gitlab_emoji to ~> 0.2.0rs-update-gitlab_emojiRobert Speicher2015-12-052-2/+2
* | | | | | | Update CHANGELOG for 7bb8bb85Stan Hu2015-12-101-0/+1
* | | | | | | Merge branch 'auth_hash_fix' into 'master' Stan Hu2015-12-112-3/+3
|\ \ \ \ \ \ \
| * | | | | | | AuthHash should not parameterize email userCorey Hinshaw2015-12-102-3/+3
* | | | | | | | Merge branch 'remove_check_icon_from_mr_page' into 'master' Dmitriy Zaporozhets2015-12-111-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove check icon from merged requestsremove_check_icon_from_mr_pageAchilleas Pipinellis2015-12-101-1/+0
* | | | | | | | | Merge branch 'bump-devise-3.5.3' into 'master' Dmitriy Zaporozhets2015-12-113-3/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |