Robert Speicher
dba47f680d
Merge branch 'issue_13301_emoji-menu' into 'master'
...
Load award emoji picker with ajax request
Fixes #13301 .
See merge request !2888
2016-02-24 02:50:45 +00:00
Annabel Dunstone
476a804969
Update award_emoji test
2016-02-23 19:37:15 -06:00
Robert Speicher
5deb4ac144
Merge branch 'fix-todos' into 'master'
...
Does not raise an error when Todo is already marked as done
Closes #13681
See merge request !2926
2016-02-23 17:47:59 +00:00
Douglas Barbosa Alexandre
28097398c5
Does not raise an error when Todo is already marked as done
2016-02-23 10:43:29 -03:00
Phil Hughes
01b965f6da
Correctly checks if tree view is on screen
2016-02-23 13:41:03 +00:00
Phil Hughes
d80205b755
Fixes issue with file view rows not clickable on project main view
...
Fixed an issue where it would only load the first 25 commit data on project main view
Stopped the file view sending 1 too many requests
Fixes #3916
2016-02-23 09:06:26 +00:00
Annabel Dunstone
7bb378b33d
Create EmojisController
2016-02-22 20:16:00 -06:00
Douglas Barbosa Alexandre
f37765efa2
Use before_action instead of before_filter
2016-02-21 12:52:37 -03:00
Douwe Maan
d53ae7f14d
Add "Mark all as done" button
2016-02-20 11:59:19 -08:00
Douglas Barbosa Alexandre
f42b1fa6e5
Fix rubucop offenses
2016-02-20 13:10:37 -02:00
Douglas Barbosa Alexandre
3d52e139b1
Rename Tasks to Todos
2016-02-20 12:39:27 -02:00
Douglas Barbosa Alexandre
ce78813c2a
Create or mark task pending as soon the action happens
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
07eb334c25
Add filters by project, author, type, and action to task queue page list
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
917081fe9d
Fix rubocop offenses
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
48ddf9a407
Remove task abilities, since we will only ever show the user their own
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
38026e5f77
Add pending tasks badge on top right next to the new and logout button
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
77d7910b8b
Allow user to mark each task as done manually
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
7cafa2ce92
Add tasks queue list page
2016-02-20 12:10:26 -02:00
Douwe Maan
31682eb987
Merge branch 'visibletrap/gitlab-ce-label'
2016-02-19 17:54:13 -08:00
Douwe Maan
3a97a5ddfd
Merge branch 'rs-blob' into 'master'
...
Add a `Blob` model that wraps `Gitlab::Git::Blob`
This allows us to take advantage of Rails' `to_partial_path` to render
the correct partial based on the Blob type, rather than cluttering the
view with conditionals.
It also allows (and will allow in the future) better encapsulation for
Blob-related logic which makes sense for our Rails app but might not
make as much sense for the core `gitlab_git` library, such as detecting
if the blob is an SVG.
See merge request !2887
2016-02-20 01:12:52 +00:00
Jacob Schatz
de84fa365e
Merge branch 'issue_3276' into 'master'
...
Labels should be visible in milestone view
Closes #3276
See merge request !2599
2016-02-19 19:44:13 +00:00
Rubén Dávila and Robert Speicher
cc5ff3b5a4
Use the adequate success path on the JSON endpoint.
...
I forgot to update this and some spinach specs were failing.
2016-02-19 13:15:43 -05:00
Rubén Dávila and Robert Speicher
5ef3f80d41
More updates from the last code review.
2016-02-19 13:15:42 -05:00
Rubén Dávila and Robert Speicher
b8295fc323
Fix build and add specs
2016-02-19 13:14:53 -05:00
Rubén Dávila and Robert Speicher
328b52d58a
Some updates after last code review.
2016-02-19 13:14:52 -05:00
Rubén Dávila and Robert Speicher
38e708f0ce
Add link to fork if user can't revert MR.
2016-02-19 13:14:52 -05:00
Rubén Dávila and Robert Speicher
9d4c105ab0
Remove code introduced when endpoint was in MR controller.
2016-02-19 13:14:52 -05:00
Rubén Dávila and Robert Speicher
a28eef1d1a
Update copy and URLs used when reverting MRs.
2016-02-19 13:14:52 -05:00
Rubén Dávila and Robert Speicher
1469b72c46
Check that target_branch is present.
2016-02-19 13:14:51 -05:00
Rubén Dávila and Robert Speicher
4dc8350517
Reuser revert commit modal in MR detail page.
2016-02-19 13:14:51 -05:00
Rubén Dávila and Robert Speicher
b36319a17c
Make MRs with revert commit work.
2016-02-19 13:14:50 -05:00
Rubén Dávila and Robert Speicher
8061399368
Add RevertService class with basic logic to revert commit
2016-02-19 13:14:50 -05:00
Rubén Dávila and Robert Speicher
34e26b8212
Add button to revert commit on Commit detail page.
2016-02-19 13:14:50 -05:00
Rubén Dávila and Robert Speicher
b6fe51b901
Some updates from last code review.
2016-02-19 13:14:50 -05:00
Rubén Dávila and Robert Speicher
df5f362c34
Add some specs plus some refactor.
2016-02-19 13:14:50 -05:00
Rubén Dávila and Robert Speicher
ae46d6ea04
Explain why MR can't be reverted.
2016-02-19 13:14:49 -05:00
Rubén Dávila and Robert Speicher
5bb5019e04
Use adequate description for new MR.
2016-02-19 13:14:49 -05:00
Rubén Dávila and Robert Speicher
f4ff2ba57b
Check target branch exists before creating revert MR.
2016-02-19 13:14:49 -05:00
Rubén Dávila and Robert Speicher
207522f923
Some refactor to the revert commit creation.
...
* Not required to run hooks since it's an internal commit
2016-02-19 13:14:49 -05:00
Rubén Dávila and Robert Speicher
f56ee9d3b9
Save merge commit id when MR is merged
2016-02-19 13:14:49 -05:00
Rubén Dávila and Robert Speicher
d7511a4b04
Create reverse branch and generate MR with new branch. #3409
2016-02-19 13:14:48 -05:00
Rubén Dávila and Robert Speicher
d3c2437328
Add new endpoint and button to revert merge. #3409
2016-02-19 13:14:48 -05:00
Grzegorz Bizon
96158aa6b3
Merge branch 'ci/remove-builds' into 'master'
...
Make it possible to erase build content (artifacts, trace)
This feature makes it possible to remove build content - build artifacts and build traces.
- [x] Remove artifacts
- [x] Remove metadata
- [x] Remove build traces
- [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged
- [x] Fix the permissions after the merge
Closes #3421
See merge request !2560
2016-02-19 17:04:07 +00:00
Grzegorz Bizon
86a49dfb88
Move build erasable implementation from concern to model
...
Discussion:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3659905
2016-02-19 17:24:59 +01:00
Grzegorz Bizon and Grzegorz Bizon
2c7f36f430
Update relevant build fields when build is erased
2016-02-19 17:24:59 +01:00
Grzegorz Bizon and Grzegorz Bizon
c8102d938b
Add build eraseable feature implementation
2016-02-19 17:24:03 +01:00
Grzegorz Bizon
c1affed196
Add build remove button to build summary view
2016-02-19 17:24:03 +01:00
Achilleas Pipinellis and Rémy Coutable
c6e0db03eb
Mention project name in fork notice
2016-02-19 17:06:14 +01:00
Patricio Cano
75ad91822d
Merge branch 'saml-decoupling' into 'master'
2016-02-19 10:41:54 -05:00
Douwe Maan
ad12f11f3e
Merge branch 'rs-emoji' into 'master'
...
Update Gemojione for new hotness ✨
Before | After
------ | -----
 | 
See merge request !2800
2016-02-19 08:11:02 +00:00
