home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,190 Commits 48 Branches 340 Tags
b05ab108f8f054e137d6ca3df9c211152afa23c7
Commit Graph
2902 Commits
Author SHA1 Message Date
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
Douglas Barbosa Alexandre 41d8f5649e Add task model 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
Douwe Maan c352aaa008 Merge branch '12792-emoji-as-text-diff-comment' 2016-02-19 16:59:36 -08: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
Kamil Trzciński bcc2332061 Merge branch 'commit-status-fix' into 'master' 
Fix missing ignored? for GenericCommitStatus

This is pretty important fix. We should not release 8.5 without this.

It critical error when handling GenericCommitStatus:
```
undefined method `ignored?' for #<GenericCommitStatus:0x007fe1a2a20fe0>
```

cc @grzesiek 


See merge request !2899
 2016-02-19 19:22:25 +00:00
Kamil Trzcinski aa812dbfcc Fix missing ignored? for GenericCommitStatus 2016-02-19 19:58:43 +01:00
Rubén DávilaandRobert Speicher 5ef3f80d41 More updates from the last code review. 2016-02-19 13:15:42 -05:00
Rubén DávilaandRobert Speicher 28aaef24ad Don't use self when looking for cross-references! 2016-02-19 13:14:55 -05:00
Rubén DávilaandRobert Speicher 169070ba4b Some updates from last code review. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher d958d027dc Make #commit_with_hooks return the new obj id plus some other fixes. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher d34733efc4 Don't show revert button if commit/MR has already been reverted. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher a07021fa8e Make more robust the test to see if a commit has been previously reverted. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher be54ba33ed Refactor commit message for revert commit. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher 02f48053f1 No longer need to ignore temporary branch. 
* Now it's only created when user choose to create a MR and
  logic to hide it is handled by https://gitlab.com/gitlab-org/gitlab-ce/blob/50595af7b0e304f16e2955109abd2d25cd96efda/app/helpers/application_helper.rb#L139
 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher f088caca3b Use a reference to the MR when reverting MRs. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher b8295fc323 Fix build and add specs 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 2ea5b37f2e Some fixes and refactors for code related to forks. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 11345866d8 Don't make Repository#revert aware of MRs. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 328b52d58a Some updates after last code review. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 38e708f0ce Add link to fork if user can't revert MR. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher a28eef1d1a Update copy and URLs used when reverting MRs. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 38752d159d Remove no longer required methods on MR. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher e22cdb40ec Big refactor for #revert_commit. 
* Now checking if a commit is already reverted or there is a conflict is
  much more faster.
* No longer need to create a new branch.
 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher ef591b87d1 Fix commit message plus other little fix. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher b0693318c3 Show list of branches plus some fixes. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 6b0e478353 Some fixes required for conflicts on revert. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 91e6e32d13 Make it work for merge commits. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher b36319a17c Make MRs with revert commit work. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 8061399368 Add RevertService class with basic logic to revert commit 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher b6fe51b901 Some updates from last code review. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 1708e1fc03 Create branch if it doesn't exists. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher df5f362c34 Add some specs plus some refactor. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher b5935f0782 Remove no longer required method. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher 0b7d70a35e Use #iid for revert branch name so it's consistent when the MR id in the URL. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert 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ávilaandRobert Speicher f56ee9d3b9 Save merge commit id when MR is merged 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher 720e52d9d9 Add merge_commit_sha column to merge_requests. 2016-02-19 13:14:48 -05:00
Rubén DávilaandRobert Speicher d7511a4b04 Create reverse branch and generate MR with new branch. #3409 2016-02-19 13:14:48 -05: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 293999cabb Fix name of build erasable, remove superfluous method from it 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon c850ceec5d Create method that checks if build has been erased 
+ minor improvements
 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 433de7baca Remove boolean erase column from ci build and foreign key 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 2c7f36f430 Update relevant build fields when build is erased 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon bae3701073 Add build eraseable columns to ci builds table 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon f3e92fb4d0 Make CI build eraseable only if build is completed 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon c8102d938b Add build eraseable feature implementation 2016-02-19 17:24:03 +01:00
Grzegorz Bizon f6a91ccc5b Move eraseable implementation to build concern 2016-02-19 17:24:03 +01:00