home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
465 Commits
Author SHA1 Message Date
Jacob Schatz 2c9894d457 Merge branch 'project-title-dropdown' into 'master' 
Project dropdown in header uses new dropdown



See merge request !3339
 2016-04-12 17:50:27 +00:00
Jacob Schatz e1838980c6 Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' 
Fix quick submit missing in edit merge request page

closes #14953 

![fix](/uploads/5b80b37330929514c81299b4c8fe3efb/fix.gif)

See merge request !3601
 2016-04-12 17:15:52 +00:00
Phil HughesandJacob Schatz f870857ddd Updated tests 2016-04-12 13:10:43 -04:00
Jacob Schatz 4087bd16e8 Merge branch 'dashboard-filter-milestone' into 'master' 
Fixed issue with dashboard/issues not filtering by milestone

Closes #15128

See merge request !3650
 2016-04-11 13:56:29 +00:00
Jacob Schatz 69a8bf367c Merge branch 'mr-ui-update' into 'master' 
Updated UI for new merge request

Closes #2540 

![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png)

![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png)

See merge request !3228
 2016-04-11 11:25:40 +00:00
Phil Hughes 2f4dc45da2 Fixed issue with dashboard/issues not filtering by milestone 
Closes #15128
 2016-04-11 11:38:24 +01:00
Arinde Eniola 91905ae3f5 write test to prevent reoccurence of issue 2016-04-09 23:31:45 +01:00
Arinde Eniola 400a1ae04d add some changes to the test 2016-04-07 23:44:59 +01:00
Annabel Dunstone dab4ac54b6 Diff design updates 2016-04-07 15:33:18 -07:00
Annabel Dunstone de63de18d7 Update diff colors and icons 2016-04-07 15:33:18 -07:00
Arinde Eniola 451314df96 add test 2016-04-07 20:51:16 +01:00
Rémy Coutable 8eae7b1088 Merge branch 'feature/expose-builds-badge' into 'master' 
Expose badges

This MR exposes badge somewhere in visible place.

![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png)

Closes #13801

See merge request !3326
 2016-04-07 08:40:15 +00:00
Robert Speicher 730625f022 Merge branch 'patch/fix-markdown-preview-wikis' into 'master' 
Wiki preview URL converting problem [via Markdown]

Current implementation when rendering the preview, thinks relative links are for project repository files.

We are creating a new preview route that will define correct context data to render for wikis instead.

Fixes #2380, #1184

See merge request !3461
 2016-04-07 00:17:21 +00:00
Grzegorz Bizon 7640b050c0 Add feature specs for list of badges page 2016-04-06 19:56:34 +02:00
Jacob Schatz 77e178b5e1 Merge branch 'fix_missing_filters_on_status_tab_change' into 'master' 
Fix missing filters on status tab when user swithches to another state

closes #14769 

![fixi](/uploads/7733ec714b70b2157104af4b039953c3/fixi.gif)

See merge request !3482
 2016-04-06 17:21:25 +00:00
Phil Hughes 39ecce05c7 Build fix 2016-04-06 16:25:38 +01:00
Gabriel Mazetto 207b7218aa Ensure correct filter order to validate with our markdown spec 2016-04-06 03:30:56 -03:00
Gabriel Mazetto 22055e1058 Fix a few edited references from WikiLinkFilter and specs 2016-04-06 03:13:46 -03:00
Arinde Eniola 1e87679702 complete the tests 2016-04-06 03:42:27 +01:00
Arinde Eniola 55b2fae327 set up test for preventing this issue from reoccuring 2016-04-06 02:50:01 +01:00
Jacob Schatz 4258589d95 Merge branch 'note-form-design' into 'master' 
Notes form design update

Part of #3401

See merge request !3442
 2016-04-05 19:34:16 +00:00
connorshea b9abf938ed Wrap images in discussions and wikis with a link to the image source using ImageLinkFilter. 
Resolves #14411.

See merge request !3464
 2016-04-04 19:44:07 -06:00
Stan Hu 7877138958 Fix creation of merge requests for orphaned branches 
Closes #14875
 2016-04-04 04:51:05 -07:00
Phil Hughes 1f50833430 Updated tests 2016-04-04 10:48:49 +01:00
Phil Hughes 29f414aa5a Tests update 2016-04-04 10:48:49 +01:00
Rémy Coutable e60f034126 Fix view of notes in search results when noteable is a snippet 
Also, streamline the view.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-03-31 09:40:57 +02:00
Phil Hughes 6a3d8ac207 Spec updates 2016-03-29 18:20:10 +01:00
Phil Hughes 31fea92295 Updated based on Ruby feedback 2016-03-29 15:26:12 +01:00
Phil Hughes c9dea7761d Added tests for upcoming milestone filter 2016-03-29 11:57:04 +01:00
Douwe Maan a7ca8689f7 Merge branch 'fix-14607' into 'master' 
Ensure private project snippets are not viewable by unauthorized people

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607

See merge request !1946
 2016-03-29 08:21:48 +00:00
Rémy Coutable 4f07c0a107 Ensure project snippets have their own access level 2016-03-25 18:51:17 +01:00
Jacob Schatz 1cc6d786e4 Fix minor code style issues 
Fix underscore template error.
Fix `=` spacing
 2016-03-25 09:54:05 -04:00
Jacob Schatz 42389ea8d2 Fix features until tests pass. 
Milestones needed a none selector
Assignee needed unassign.
 2016-03-25 09:54:05 -04:00
Alfredo SumaranandJacob Schatz 531331f79d Fix specs 2016-03-25 08:10:25 -04:00
Rémy Coutable 2824972c36 Fix specs broken by !3270 and !3337. 2016-03-24 10:10:46 +01:00
Robert Speicher f49e9e8f77 Merge branch 'update-issues-tests' into 'master' 
Multi-update issues tests

There were no tests for updating multiple issues at a time - this fixes
that 👍 

See merge request !3357
 2016-03-23 19:59:42 +00:00
Phil Hughes 23bfa7a3bd Update milestone spec 2016-03-23 11:45:24 +00:00
Phil Hughes 84f124a14f Assignee tests 2016-03-23 11:19:32 +00:00
Phil Hughes 7e2806a123 Added tests for setting multiple status on issues 2016-03-23 11:19:32 +00:00
Rémy Coutable ce44e5a787 Add missing Dashboard::LabelsController 2016-03-23 12:02:15 +01:00
Douwe Maan 31266c5be4 Address feedback 2016-03-22 00:09:20 +01:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
 2016-03-21 23:22:21 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Douwe Maan 2eb19ea3ea Merge branch 'master' into issue_12658 2016-03-20 14:57:25 +01:00
Grzegorz Bizon 0115ad66d2 Merge branch 'master' into feature/issue-move 
* master: (121 commits)
  Dedupe labels in labels selector in Dashboard pages
  Refactor colors and lists
  Add a safeguard in MergeRequest#compute_diverged_commits_count
  Fix an issue when the target branch of a MR had been deleted
  Add avatar to issue and MR pages header
  Cleanup somce css colors
  Re-group scss variables
  Refactor `Todo#target`
  Fixes issue with filter label missing on labels & milestones
  Rename `Todo#to_reference` to `Todo#target_reference`
  Fixed failing tests
  Updated controller with before_action Fixed other issues based on feedback
  Fixes issue on dashboard issues
  Full labels data in JSON
  Fixed issue with labels dropdown getting wrong labels
  Update CHANGELOG
  Use `Note#for_project_snippet?` to skip notes on project snippet
  Use `Commit#short_id` instead of `Commit.truncate_sha`
  Reuse `for_commit?` on conditional validations
  Update schema info comment on todo related files
  ...

Conflicts:
	app/models/issue.rb
	db/schema.rb
	spec/models/issue_spec.rb
 2016-03-19 18:50:15 +01:00
Felipe Artur 8b830b8c3b Fix specs 2016-03-18 21:04:53 -03:00
Jacob Schatz f4b6a89252 Merge branch 'issue-fade-load' into 'master' 
Changing filter dropdowns shows loading

Instead of doing a full refresh of the page - i've modified the filterResults method on the Issues object to work for this form as well

![issues](/uploads/3335f09f7df88b6d419de7fd3d6857d2/issues.gif)

Closes #14359

See merge request !3237
 2016-03-18 12:25:09 +00:00
Phil Hughes 16d02de56e Fixed issue with dashboard issues not reloading 2016-03-18 11:40:16 +00:00
Douglas Barbosa Alexandre 43d8bdb4f0 Restrict access to references for confidential issues 2016-03-17 20:55:59 -03:00
Felipe Artur 0a7f716119 Code fixes 2016-03-17 19:42:46 -03:00