Commit Graph

157 Commits

Author SHA1 Message Date
Winnie Hellmann d2b4109b08 Display GPG status loading spinner only when Ajax request is made 2017-08-15 08:20:35 +00:00
Clement Ho cf55fb9b96 Merge branch '34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master'
Resolve "Make edit comment button always available outside of dropdown"

Closes #34527

See merge request !12931
2017-08-14 17:08:28 +00:00
Robin Bobbitt 649d042dbc Add option to disable project export on instance 2017-08-11 12:22:37 -04:00
Simon Knox 8858ddaf83 take edit note button out of dropdown 2017-08-10 09:37:25 +10:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Robert Speicher 9513bd18c4 Ensure all project factories use `:repository` trait or `:empty_project` 2017-08-01 14:51:52 -04:00
Athar Hameed 9442c33584 Fix 500 error when rendering avatar for deleted project creator 2017-07-28 15:23:40 +00:00
Keifer Furzland 7e113b6824 Remove superfluous type defs in specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:52 +02:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Douwe Maan 70b05a8377 Split up MergeRequestsController 2017-06-28 18:17:44 -05:00
Phil Hughes 9fca7b4379 Limit the width of commit & snippet comment sections 2017-06-23 10:45:08 +00:00
Grzegorz Bizon 0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
Douwe Maan d9d020b169 Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'
Only show 'Edit comment'/'Report as abuse' when user has perms/isnt current_user

See merge request !12096
2017-06-20 16:04:46 +00:00
Grzegorz Bizon ff97afdd58 Merge branch '33461-display-user-id' into 'master'
Display own user id in account settings pages

Closes #33461

See merge request !12141
2017-06-19 11:21:25 +00:00
Luke "Jared" Bennett 0bfe78d716
Pass more_actions_dropdown vie spec locals to render call instead of stubbing them 2017-06-16 09:14:21 +01:00
Luke "Jared" Bennett 2ef19a24a6
Add view spec for more_actions_dropdown render branches 2017-06-16 09:14:21 +01:00
Eric Eastwood ea090291bb Rename "Slash commands" to "Quick actions"
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070

Deprecate "chat commands" in favor of "slash commands"

We looked for things like:

 - `slash commmand`
 - `slash_command`
 - `slash-command`
 - `SlashCommand`
2017-06-15 09:01:56 -05:00
Riccardo Padovani aa2e2cacb4 Update test to use single quotes and Four-Phase test conventions 2017-06-15 11:38:12 +00:00
Riccardo Padovani 0814129561 #33641: add spec for profile page 2017-06-15 00:16:22 +02:00
Douwe Maan 7944254563 Implement diff viewers 2017-06-14 10:12:21 -05:00
Filipa Lacerda 452202e36d Improve Job detail view to make it refreshed in real-time instead of reloading 2017-06-12 09:20:19 +00:00
Toon Claes 7188b4d839 Make the revision on the `/help` page clickable
For quicker access, add hyperlink to the gitlab.com commits page for the current
REVISION of GitLab.
2017-06-09 10:35:42 +02:00
Sean McGivern 04251829ba Merge branch 'dm-collapsed-blob' into 'master'
Consistent diff and blob size limit names

See merge request !11776
2017-06-01 09:10:53 +00:00
Douwe Maan aed0387f97 Consistent diff and blob size limit names 2017-05-29 17:02:02 -05:00
Lin Jen-Shin 54a8cbddb1 Merge remote-tracking branch 'upstream/master' into rename-builds-controller
* upstream/master: (31 commits)
  Remove 'no changes' entries from changelog
  Check if OLD is set when migrating issue assignees
  Fix data migration from trigger schedules
  Replace EFS section in AWS guide
  Add warning about AWS EFS and performance
  Consolidate opening text from about.gitlab.com and add active/passive note
  Fix invalid object reference in ee_compat_check script
  Fix Ordered Task List Items
  Add auxiliary viewer for README
  Update fe_guide testing.md
  Add auxiliary blob viewer for CHANGELOG
  Add spec for last commit info when browsing repository files
  Show last commit for current tree on tree page
  Use same last commit widget on project homepage and tree view
  Fix unassigned checkmark
  Add missing changelog for iPython notebook rendering feature
  Convert fa-history to svg; tweak alignment
  Get rid of pluck in app/services/members/authorized_destroy_service.rb
  Removes duplicate environment variable in documentation
  Fixed spacing issues in issue sidebar
  ...
2017-05-18 15:33:52 +08:00
Douwe Maan d3b24a7638 Show last commit for current tree on tree page 2017-05-17 20:59:26 +03:00
Douwe Maan c5a13781fa Use same last commit widget on project homepage and tree view 2017-05-17 10:57:40 -05:00
Lin Jen-Shin 71777a4a18 Rename BuildsController to JobsController
Rename other URL generators

admin_builds_path -> admin_jobs_path

Fix tests and more renaming

Fix more tests

Also change build_id to job_id in the controller
2017-05-17 20:17:30 +08:00
Douwe Maan b0a163208c Rename BlobViewer max_size to overridable_max_size and absolute_max_size to max_size 2017-05-15 10:03:34 -05:00
Douwe Maan acffc06213 Specify explicitly whether a blob viewer should be loaded asynchronously 2017-05-13 11:46:10 -05:00
Douwe Maan 08706f6837 Implement auxiliary blob viewers 2017-05-10 20:07:04 -05:00
Regis Boudinot 81df0034f4 Merge branch 'retried-in-database-mysql' into 'master'
Retried in database

Closes #25737

See merge request !11115
2017-05-10 22:07:05 +00:00
Robert Speicher 180ec7113e Merge branch 'bvl-security-patches' into 'master'
Security patches -> `master`

See merge request !11230
2017-05-10 18:26:02 +00:00
Robert Speicher e5e94618c5 Merge branch 'fix-hamlit-xss' into 'security-9-1'
New Hamlit XSS fix, does not include extraneous changes

See merge request !2095
2017-05-10 16:48:18 +02:00
Douwe Maan 00fc9f2607 Load tree readme asynchronously 2017-05-10 08:21:58 -05:00
Kamil Trzcinski f2a4420d66
Store retried in database for CI builds 2017-05-07 22:43:53 +02:00
Kamil Trzcinski c195b313ad
Make test that actually displays pipeline graph 2017-05-07 14:09:21 +02:00
Kamil Trzciński 2e6201b131 Merge branch 'fix/gb/hide-environment-external-url-btn-when-not-provided' into 'master'
Hide environment external URL button if not defined

Closes #30832

See merge request !11029
2017-05-06 17:10:06 +00:00
Jarka Kadlecova e4f7b87ddb Support comments for personal snippets 2017-05-05 15:45:49 +02:00
Grzegorz Bizon e944fd7064 Merge commit '3a2b60f7a' from 'master'
* commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (254 commits)
  Fixed Karma spec
  Reject EE reserved namespace paths in CE as well
  Updated webpack config
  Include the bundler:audit job into the static-analysis job
  Document serializers
  Add artifact file page that uses the blob viewer
  Pipeline table mini graph dropdown remains open when table is refreshed
  Adds off for event hub
  Compile gitlab-shell go executables
  Allow to create new branch and empty WIP merge request from issue page
  Moved to a view spec
  Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.md
  Convert seconds to minutes and hours on chat notifations
  Disable navigation to Pages config if Pages is disabled
  Sort the network graph both by commit date and topographically.
  Add tooltips to note action buttons
  Add breadcrumb, build header and pipelines submenu to artifacts browser
  Update todos screenshots
  removes the possibility of commit messages having carriage returns
  Handle incoming emails from aliases correctly
  ...
2017-05-05 12:31:10 +02:00
Robert Speicher 50b89fc5b0 Merge branch 'tags-sort-default' into 'master'
Fixed tags sort dropdown being empty

Closes #31618

See merge request !11055
2017-05-04 14:07:59 +00:00
Phil Hughes fdacc4ee6a Moved to a view spec 2017-05-04 08:54:42 +01:00
Phil Hughes ce5f7008fb Fixed view specs 2017-05-02 16:02:58 +01:00
Grzegorz Bizon 48bb892124 Hide environment external URL button if not defined 2017-05-02 13:21:06 +02:00
Phil Hughes a3143f83bd Merge branch 'master' into commit-limited-container-width 2017-05-02 11:02:11 +01:00
Douwe Maan 60ebd101d0 Use blob viewers for snippets 2017-04-30 11:21:20 -05:00
Phil Hughes 7fd3a5883e Changed spec to a view spec 2017-04-28 12:11:30 +01:00
Douwe Maan dc4726f0a7 Satisfy Rubocop 2017-04-27 12:23:27 -05:00
Douwe Maan 964e7d206b Add specs 2017-04-27 12:23:26 -05:00
Douwe Maan a7fd95cd22 Render viewer error synchronously so that 'view the source' link will work 2017-04-27 12:23:26 -05:00