Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add explicit reference to rouge 1.10.1gemfile_fix | Valery Sizov | 2015-12-08 | 2 | -1/+3 |
* | Merge branch 'fix-random-test' into 'master' | Dmitriy Zaporozhets | 2015-12-08 | 3 | -4/+16 |
|\ | |||||
| * | Fix random failing test - delete attachmentfix-random-test | Dmitriy Zaporozhets | 2015-12-07 | 3 | -4/+16 |
|/ | |||||
* | Merge branch 'rs-spec-failure' into 'master' | Robert Speicher | 2015-12-07 | 1 | -1/+1 |
|\ | |||||
| * | Fix spec failure introduced by 9d03bc6fa31f123e070bab4a58b67dbb008e75e9 | Robert Speicher | 2015-12-07 | 1 | -1/+1 |
* | | Merge branch 'fix-random-failing-test' into 'master' | Dmitriy Zaporozhets | 2015-12-07 | 2 | -2/+8 |
|\ \ | |/ |/| | |||||
| * | Fix random failing test | Dmitriy Zaporozhets | 2015-12-07 | 2 | -2/+8 |
* | | Merge branch 'pberndt:master' into 'master' | Robert Speicher | 2015-12-07 | 1 | -1/+1 |
|\ \ | |||||
| * | | time_ago_with_tooltip javascript snippet: Don't reinitialize older elements | Phillip Berndt | 2015-12-03 | 1 | -1/+1 |
* | | | Merge branch 'fix-parallel-merge' into 'master' | Dmitriy Zaporozhets | 2015-12-07 | 2 | -2/+3 |
|\ \ \ | |||||
| * | | | Dont use cached collection for Repository find_branch and find_tag methods | Dmitriy Zaporozhets | 2015-12-07 | 2 | -2/+3 |
* | | | | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ce | Dmitriy Zaporozhets | 2015-12-07 | 5 | -23/+29 |
|\ \ \ \ | |||||
| * | | | | Fix spec | Stan Hu | 2015-12-04 | 1 | -3/+1 |
| * | | | | Handle and report SSL errors in Web hook test. Check for status 200 for success. | Stan Hu | 2015-12-04 | 4 | -20/+28 |
* | | | | | Merge branch 'add_assign_to_me' into 'master' | Dmitriy Zaporozhets | 2015-12-07 | 0 | -0/+0 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Filter current user to the top of issue assignee list | Drew Blessing | 2015-12-03 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'fix-api-private-project-update' into 'master' | Dmitriy Zaporozhets | 2015-12-07 | 3 | -2/+19 |
|\ \ \ \ | |||||
| * | | | | Fix API setting of 'public' attribute to false will make a project private | Stan Hu | 2015-12-05 | 3 | -2/+19 |
* | | | | | Merge branch 'minimize-readme' into 'master' | Dmitriy Zaporozhets | 2015-12-07 | 2 | -2/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Move release cycle comments to the documentation.minimize-readme | Sytse Sijbrandij | 2015-12-05 | 2 | -2/+6 |
* | | | | | | Merge branch 'feature/sidekiq-cron' into 'master' | Dmitriy Zaporozhets | 2015-12-07 | 6 | -21/+49 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Migrate from Sidetiq to Sidekiq-cronfeature/sidekiq-cron | Gabriel Mazetto | 2015-12-04 | 6 | -21/+49 |
* | | | | | | Merge branch 'fix-docker-syntax' into 'master' | Kamil TrzciĆski | 2015-12-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update Docker Syntax | Michael A. Smith | 2015-12-07 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'webhook_payload_with_changes' into 'master' | Valery Sizov | 2015-12-07 | 7 | -45/+58 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fixes after reviewwebhook_payload_with_changes | Valery Sizov | 2015-12-07 | 3 | -18/+11 |
| * | | | | | | fox specs | Valery Sizov | 2015-12-07 | 4 | -17/+28 |
| * | | | | | | Add added, modified and removed properties to commit object in webhook | Valery Sizov | 2015-12-04 | 6 | -42/+51 |
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Stan Hu | 2015-12-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #9892 from stetskevych/fix_nginx_ssl_config | Jacob Vosmaer | 2015-12-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix gitlab-ssl nginx config to work when multiple server_names are served ove... | Vyacheslav Stetskevych | 2015-12-06 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'gsmethells/gitlab-ce-sort-by-due-date' | Douwe Maan | 2015-12-07 | 8 | -10/+48 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Satisfy Rubocop | Douwe Maan | 2015-12-07 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-dategsmethells/gitlab-ce-sort-by-due-date | Douwe Maan | 2015-12-07 | 201 | -1253/+2168 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| * | | | | | | | | | sort milestones by due_date | Greg Smethells | 2015-12-03 | 8 | -11/+49 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' | Grzegorz Bizon | 2015-12-07 | 11 | -43/+129 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Simplify `contains_emoji_only?` method in `Note`fix/award-emoji-conflict-in-notes | Grzegorz Bizon | 2015-12-07 | 1 | -2/+1 |
| * | | | | | | | | | Remove space before exclamation mark in award alert | Grzegorz Bizon | 2015-12-05 | 1 | -1/+1 |
| * | | | | | | | | | Refactor note awards to reuse `emoji_pattern` and improve validator | Grzegorz Bizon | 2015-12-05 | 1 | -18/+14 |
| * | | | | | | | | | Make method `supports_award?` public in `Note` | Grzegorz Bizon | 2015-12-03 | 1 | -2/+2 |
| * | | | | | | | | | Combine new javascript Flash methods into one | Grzegorz Bizon | 2015-12-03 | 2 | -7/+3 |
| * | | | | | | | | | Support emoji awards also in merge requests | Grzegorz Bizon | 2015-12-03 | 1 | -3/+4 |
| * | | | | | | | | | Add feature test for emoji-only diff notes | Grzegorz Bizon | 2015-12-03 | 2 | -0/+23 |
| * | | | | | | | | | Pin flash message to top if award note is invalid | Grzegorz Bizon | 2015-12-03 | 1 | -1/+3 |
| * | | | | | | | | | Add new features to javascript flash message | Grzegorz Bizon | 2015-12-03 | 2 | -6/+23 |
| * | | | | | | | | | Show flash message instead of alert when note is invalid | Grzegorz Bizon | 2015-12-03 | 1 | -1/+2 |
| * | | | | | | | | | Add test for award-emoji being added as regular comment | Grzegorz Bizon | 2015-12-03 | 2 | -13/+24 |
| * | | | | | | | | | Notify user when award-emoji comment is invalid | Grzegorz Bizon | 2015-12-03 | 2 | -1/+10 |
| * | | | | | | | | | Render json message with errors if note didn't pass validation | Grzegorz Bizon | 2015-12-03 | 1 | -10/+14 |
| * | | | | | | | | | Scroll to awards after adding emoji-award comment | Grzegorz Bizon | 2015-12-03 | 2 | -1/+7 |