Commit graph

1743 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 8114d36caf Merge pull request #1720 from coagulant/wiki_search
Wiki search
2012-11-07 03:51:20 -08:00
Riyad Preukschas 10d881c9ca Line anchors for file view 2012-11-07 13:31:26 +02:00
Riyad Preukschas be4138af75 Log caught exceptions 2012-11-06 21:16:47 +01:00
Dmitriy Zaporozhets 96b2959fe3 Styled chosen css. Lighter box shadow for blocks 2012-11-06 19:31:01 +02:00
Dmitriy Zaporozhets 949233aa1f Changed default icon for gravatar. Moved filter out of layout 2012-11-06 13:47:43 +02:00
Dmitriy Zaporozhets f555578414 Added EventFilter class. Compeleted first version of dashbaord filtering 2012-11-05 20:12:26 +02:00
Dmitriy Zaporozhets ba567c8d76 Merge pull request #1914 from tsigo/issue/1910
Fix double icon on header button hover
2012-11-05 03:27:48 -08:00
Valeriy Sizov 4f04d7df66 Merge pull request #1915 from tsigo/issue/1912
Fix rendered action for password change failure
2012-11-05 01:29:03 -08:00
Robert Speicher 89d9319a79 Fix rendered action for password change failure
Closes #1912
2012-11-04 16:47:37 -05:00
randx f082c8ae2a Decouple and refactor GraphCommit 2012-11-04 23:43:33 +02:00
Robert Speicher 97bf7ac397 Fix double icon on header button hover 2012-11-04 16:29:44 -05:00
Dmitriy Zaporozhets f8e27b92bf Merge pull request #1902 from tsigo/breadcrumbs
Fix breadcrumb links on Commits page
2012-11-02 03:46:27 -07:00
Riyad Preukschas 48de0ba867 Fix source for iframe on Resque admin page 2012-11-01 23:34:16 +01:00
Robert Speicher e60185699b Add 'breadcrumbs' helper for Commit breadcrumb links
Closes #1731
2012-11-01 17:58:13 -04:00
Robert Speicher badb092a2d Don't initialize Tree History unless tree-slider is present
This was breaking breadcrumb links on non-Tree pages
2012-11-01 17:57:12 -04:00
Robert Speicher 57e6777b3c Remove "remote" attribute from Tree breadcrumb links
See https://github.com/gitlabhq/gitlabhq/pull/1665#discussion_r1804447
2012-11-01 17:56:39 -04:00
Dmitriy Zaporozhets d9c20cf5a6 Fix 404 errors on Merge Request -> new 2012-10-31 14:29:42 +02:00
Dmitriy Zaporozhets 404040d7ae Fix invalid template path for huge commit 2012-10-30 13:35:57 +02:00
Dmitriy Zaporozhets 8272e18e57 Project path validation: array of not allowed paths 2012-10-30 13:27:15 +02:00
randx 36dbac2fd9 More seeds 2012-10-30 10:03:21 +02:00
randx e4cf99db46 Refactor milestones related functionality. Added seeds for Milestine and MR 2012-10-30 09:22:24 +02:00
Valeriy Sizov 53a3be03fc Update app/views/profile/account.html.haml
TYPO #1870
2012-10-30 00:32:32 +02:00
Valeriy Sizov 9d56c7f657 Update app/views/shared/_no_ssh.html.haml
TYPO
2012-10-30 00:29:13 +02:00
randx a8398e5124 Fix merge request count for milestone index 2012-10-29 23:50:35 +02:00
randx e705344daa Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-10-29 23:46:46 +02:00
randx f417a265d7 Finalize milestones for Merge Requests 2012-10-29 23:45:11 +02:00
Riyad Preukschas 0a9adbbe4a Fix no SSH key warning 2012-10-29 21:51:28 +01:00
randx d4e070cfad Improve styles. Add merge request completness to milestone percentage 2012-10-29 22:40:00 +02:00
randx ecdf778e80 Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr
Conflicts:
	app/views/merge_requests/_form.html.haml
2012-10-29 21:37:46 +02:00
Dmitriy Zaporozhets 50a6c614b5 Merge pull request #1818 from riyad/refactor-satellite-actions
Refactor Satellite Code
2012-10-29 04:12:26 -07:00
Sergio Visinoni 263282dec9 Show Milestone information in MR Listing
When a MR belongs to a Milestone, show this information in the listing
with a small box telling the Milestone title.
2012-10-28 09:31:52 +01:00
Riyad Preukschas 646bad43e9 Fix styles 2012-10-27 18:27:51 +02:00
Riyad Preukschas 3d0197246e Use #author_link for blame, commits and tree 2012-10-27 18:27:47 +02:00
Riyad Preukschas c78359a84b Generalize CommitDecorator#author_link to #person_link 2012-10-27 18:15:00 +02:00
Riyad Preukschas 17cec05087 Make new/edit issue forms use containers on the page instead of adding their own
Fixes #1830
2012-10-27 17:54:24 +02:00
Riyad Preukschas 2f5e44a02d Enable/disable from buttons on all input events (not just key events)
Fixes #1836
2012-10-27 17:00:51 +02:00
randx 3c5a3fe0ae Merge branch 'front-end' of https://github.com/NARKOZ/gitlabhq into NARKOZ-front-end
Conflicts:
	app/views/issues/_form.html.haml
2012-10-27 11:24:11 +03:00
randx 72f984e3d3 Prevent grit from caching graph commits 2012-10-26 21:52:26 +03:00
Dmitriy Zaporozhets 1c9351abf0 Restyle branches list. Remove unneccesary styles from tree avatar 2012-10-26 19:00:09 +03:00
Dmitriy Zaporozhets b4708d006c Restyled git tags page. Added truncated tags message 2012-10-26 18:37:12 +03:00
Sergio Visinoni e51c37bdbd Display Merge Requests <-> Milestone relations
Show the relation between Merge Requests and Mileston in different
places:
- Merge Request page
- Milestone list page
- Milestone details page
2012-10-26 16:12:40 +02:00
Sergio Visinoni a7d0816933 Add Milestone information in Merge Requests
Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
  Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
  Merge Requests listing page
2012-10-26 16:12:40 +02:00
Riyad Preukschas 700a784bc9 Refactor EditFileAction#update and rename it to commit! 2012-10-26 01:59:50 +02:00
Riyad Preukschas fba8ad5607 Move Gitlab::Satellite into the Satellite module 2012-10-26 00:56:24 +02:00
Riyad Preukschas 5f16687805 Update arguments for Gitlab::Satellite::EditFileAction#initialize 2012-10-26 00:39:23 +02:00
Riyad Preukschas 55779b00ea Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileAction 2012-10-26 00:33:53 +02:00
Riyad Preukschas 8c89beb6f9 Change argument order for satellite actions to always start with the user 2012-10-26 00:26:47 +02:00
Riyad Preukschas 78235edda8 Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction 2012-10-26 00:19:01 +02:00
Riyad Preukschas 0447ab375a Extract shared/clone_panel partial 2012-10-25 23:39:02 +02:00
Riyad Preukschas ff396e0a7e Extract search field into a partial 2012-10-25 23:39:02 +02:00