home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,190 Commits 48 Branches 340 Tags
b05ab108f8f054e137d6ca3df9c211152afa23c7
Commit Graph
24190 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Barbosa Alexandre b05ab108f8 Add feature spec for task queue list page 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 c8f2d18abd Does not create a task for new issue when assignee is the current user 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 422a01fc85 Create a pending task when an issue is assigned to someone 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 1e0053f2dc Fix task queue list page title 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
Achilleas Pipinellis 040ae7e3e0 Merge branch 'doc_artifacts_api' into 'master' 
Fix docs on artifacts API

Small fixes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2893

- Backticks in parameters
- Remove headings
- Fix curl URL link



See merge request !2902
 2016-02-20 12:17:36 +00:00
Achilleas Pipinellis ad833c934b Fix docs on artifacts API 
- Backticks in parameters
- Remove headings
- Fix curl URL link

[ci skip]
 2016-02-20 14:13:21 +02:00
Douwe Maan 31682eb987 Merge branch 'visibletrap/gitlab-ce-label' 2016-02-19 17:54:13 -08:00
Douwe Maan 0c5abb1e0b Merge branch 'rs-move-controller-specs' into 'master' 
Move a few controller specs to their correct locations



See merge request !2889
 2016-02-20 01:12:59 +00: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 f81b55bd35 Merge branch 'refactor-scan' into 'master' 
Improve readability of 'rake cache:clear' code



See merge request !2892
 2016-02-20 01:05:00 +00:00
Douwe Maan c352aaa008 Merge branch '12792-emoji-as-text-diff-comment' 2016-02-19 16:59:36 -08:00
Kamil Trzciński 20781b2927 Merge branch 'builds-artifacts-API' into 'master' 
Introduce API for serving the artifacts archive

Add API to download build artifacts archive in context of GitLab API

/cc @DouweM @grzesiek 

See merge request !2893
 2016-02-19 22:30:11 +00:00
Achilleas Pipinellis 2cc9a42ca4 Merge branch 'doc/add-build-email-service' into 'master' 
Add documentation about build emails service

Closes #12497

See merge request !2871
 2016-02-19 21:36:47 +00:00
Achilleas Pipinellis 7f5f56d443 Move builds emails service to its own document 
[ci skip]
 2016-02-19 23:35:26 +02:00
Kamil Trzcinski 17182cdfe0 Fix documentation 2016-02-19 20:56:56 +01: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
Robert Speicher 94915f97de Merge branch 'gitlab-ce-fix/revert-ruby-2.2' into 'master' 
revert back to ruby 2.1

- - -

Revert Ruby 2.2 changes - until we solve https://gitlab.com/gitlab-org/gitlab-ce/issues/13514

This also updates Ruby 2.1.7 to 2.1.8

See merge request !2898
 2016-02-19 18:59:54 +00:00
Kamil Trzcinski aa812dbfcc Fix missing ignored? for GenericCommitStatus 2016-02-19 19:58:43 +01:00
Robert Speicher a5c7aea3a9 Merge branch 'issue_3409' into 'master' 
Add ability to revert changes introduced by Merge Requests or Commits

Closes #3409 

See merge request !1990
 2016-02-19 18:39:31 +00:00
Kamil Trzcinski 73be775cd7 Fix ci_build trace trait 2016-02-19 19:31:57 +01:00
Rémy Coutable 803d6f8f05 Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master' 
Consistency in MR and issue header.

Fixes: #13550 

![Screen_Shot_2016-02-18_at_11.20.19_AM](/uploads/8327ff045e45029b85b2cbac72c98a7f/Screen_Shot_2016-02-18_at_11.20.19_AM.png)![Screen_Shot_2016-02-18_at_11.20.55_AM](/uploads/f79613ebb23e4a62fb1bdb48d6f7fd2b/Screen_Shot_2016-02-18_at_11.20.55_AM.png)

See merge request !2874
 2016-02-19 18:21:42 +00:00
Rubén DávilaandRobert 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ávilaandRobert Speicher b79c8b5228 Update CHANGELOG 2016-02-19 13:15:42 -05:00
Rubén DávilaandRobert Speicher 5ef3f80d41 More updates from the last code review. 2016-02-19 13:15:42 -05:00
Achilleas PipinellisandRobert Speicher 78d3444fa7 Refactor and conform to styleguide 
[ci skip]
 2016-02-19 13:15:42 -05:00
Achilleas PipinellisandRobert Speicher a63bcb7b6d Rename image names to conform with styleguide 2016-02-19 13:15:42 -05:00
Achilleas PipinellisandRobert Speicher e406eb7d6a Add revert changes doc to workflow README 2016-02-19 13:15:42 -05:00
Achilleas PipinellisandRobert Speicher d521079fd8 Move images to img/ directory 2016-02-19 13:15:42 -05:00
Rubén DávilaandRobert Speicher d6e3abccb8 Add documentation for revert changes feature. 2016-02-19 13:15:42 -05:00
Rubén DávilaandRobert Speicher 112b1add4c Upgrade gitlab_git to 8.2.0 2016-02-19 13:15:39 -05:00
Rubén DávilaandRobert Speicher 87b076f2ce Add some spinach specs 2016-02-19 13:14:55 -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 6908663479 Refactor RevertService. 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 e8d15f1339 Refactor revert_commit_link helper. 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 5ad78cdbda Use a custom title in the revert modal. 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 ccd2a8d6b5 Show a tooltip on revert link. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 477ae66b4d Move revert link to the MR widget section plus some refactor. 2016-02-19 13:14:53 -05:00